From f601927ad8afb0496122b046e215836b2cfe5d0e Mon Sep 17 00:00:00 2001 From: noryb009 Date: Mon, 9 Dec 2013 18:51:17 -0500 Subject: [PATCH 01/23] Update GuitarMaster recipe The patch was accepted upstream --- ...ter-r20.recipe => guitarmaster-r21.recipe} | 6 +- .../patches/guitarmaster-r20.patch | 212 ------------------ 2 files changed, 1 insertion(+), 217 deletions(-) rename haiku-games/guitarmaster/{guitarmaster-r20.recipe => guitarmaster-r21.recipe} (89%) delete mode 100644 haiku-games/guitarmaster/patches/guitarmaster-r20.patch diff --git a/haiku-games/guitarmaster/guitarmaster-r20.recipe b/haiku-games/guitarmaster/guitarmaster-r21.recipe similarity index 89% rename from haiku-games/guitarmaster/guitarmaster-r20.recipe rename to haiku-games/guitarmaster/guitarmaster-r21.recipe index 3c040777e..4f082b9aa 100644 --- a/haiku-games/guitarmaster/guitarmaster-r20.recipe +++ b/haiku-games/guitarmaster/guitarmaster-r21.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" Usage: GuitarMaster [/path/to/songsDirectory] " HOMEPAGE="http://code.google.com/p/guitarmaster/" -SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@20" +SRC_URI="svn+http://guitarmaster.googlecode.com/svn/trunk/@21" LICENSE="MIT" COPYRIGHT="Toxic Labs 2008-2009" REVISION="1" @@ -27,10 +27,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -PATCHES=" - guitarmaster-r20.patch - " - SRC_FILENAME="download" SOURCE_DIR="$portName" diff --git a/haiku-games/guitarmaster/patches/guitarmaster-r20.patch b/haiku-games/guitarmaster/patches/guitarmaster-r20.patch deleted file mode 100644 index de7e0da10..000000000 --- a/haiku-games/guitarmaster/patches/guitarmaster-r20.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 4929c586441b40f7046487bc9b9a7dd887e3e605 Mon Sep 17 00:00:00 2001 -From: Luke -Date: Sun, 24 Nov 2013 07:51:48 +0000 -Subject: [PATCH] Search for songs directory - ---- - TApp.cpp | 5 +++-- - TApp.h | 4 +++- - TMainWindow.cpp | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - TMainWindow.h | 4 +++- - main.cpp | 11 +++++++++- - 5 files changed, 79 insertions(+), 8 deletions(-) - -diff --git a/TApp.cpp b/TApp.cpp -index b38dbe1..a9d89ec 100644 ---- a/TApp.cpp -+++ b/TApp.cpp -@@ -10,10 +10,11 @@ using namespace org::toxic; - using namespace std; - - --TApp::TApp():BApplication("application/x-vnd.guitar-master") -+TApp::TApp(BString * UserSpecifiedSongDir):BApplication("application/x-vnd.guitar-master") - { - cout<<"Guitar Master project"<UserSpecifiedSongDir = UserSpecifiedSongDir; - } - - -@@ -27,5 +28,5 @@ void TApp::ReadyToRun() - { - cout<<"ready!!"< - #include - #include "TMainWindow.h" - -@@ -16,9 +17,10 @@ namespace org - { - private: - TMainWindow * window; -+ BString * UserSpecifiedSongDir; - public: - -- TApp(); -+ TApp(BString * UserSpecifiedSongDir = NULL); - ~TApp(); - - virtual void ReadyToRun(); -diff --git a/TMainWindow.cpp b/TMainWindow.cpp -index d84cbd4..f16be1d 100644 ---- a/TMainWindow.cpp -+++ b/TMainWindow.cpp -@@ -11,12 +11,17 @@ - #include - #include - -+#include -+#include -+#include -+#include -+ - using namespace org::toxic; - using namespace org::toxic::resources; - using namespace std; - - --TMainWindow::TMainWindow(BRect frame): BWindow(frame,"Guitar Master",B_TITLED_WINDOW,B_NOT_ZOOMABLE | B_NOT_RESIZABLE) -+TMainWindow::TMainWindow(BRect frame, BString * UserSpecifiedSongDir): BWindow(frame,"Guitar Master",B_TITLED_WINDOW,B_NOT_ZOOMABLE | B_NOT_RESIZABLE) - { - cout<<"Main window"<pw_dir; -+ } -+ -+ BString * songLocations[13]; -+ songLocations[0] = UserSpecifiedSongDir; -+ songLocations[1] = new BString("songs"); -+ songLocations[2] = new BString("/music/GuitarMaster"); -+ songLocations[2]->Prepend(homeDir); -+ songLocations[3] = new BString("/music/guitarmaster"); -+ songLocations[3]->Prepend(homeDir); -+ songLocations[4] = new BString("/music/Guitar Master"); -+ songLocations[4]->Prepend(homeDir); -+ songLocations[5] = new BString("/music/guitar master"); -+ songLocations[5]->Prepend(homeDir); -+ songLocations[6] = new BString("/Music/GuitarMaster"); -+ songLocations[6]->Prepend(homeDir); -+ songLocations[7] = new BString("/Music/guitarmaster"); -+ songLocations[7]->Prepend(homeDir); -+ songLocations[8] = new BString("/Music/Guitar Master"); -+ songLocations[8]->Prepend(homeDir); -+ songLocations[9] = new BString("/Music/guitar master"); -+ songLocations[9]->Prepend(homeDir); -+ songLocations[10] = new BString("/music"); -+ songLocations[10]->Prepend(homeDir); -+ songLocations[11] = new BString("/Music"); -+ songLocations[11]->Prepend(homeDir); -+ songLocations[12] = new BString(homeDir); -+ -+ cout<<"Searching for songs directory..."<String()<String()); -+ if(songs_dir_check->InitCheck() == B_OK) { -+ SongsDirLocation = new BString(*songLocations[i]); -+ delete songs_dir_check; -+ break; -+ } -+ delete songs_dir_check; -+ } -+ } -+ -+ for(int i=0; iString()); - BEntry entry; - char str[B_FILE_NAME_LENGTH]; - BMessage * message; -@@ -128,7 +185,7 @@ void TMainWindow::MessageReceived(BMessage * mesg) - case T_MSG_SELECT_SONG: - mesg->FindString("song",&str); - -- spath<<"songs/"<String()<<"/"< - #include -+#include - #include "TGameView.h" - - #define T_MSG_FRAME 0x00FF0011 -@@ -20,10 +21,11 @@ namespace org - - TGameView * gameview; - BMessageRunner * timer; -+ BString * SongsDirLocation; - - public: - -- TMainWindow(BRect frame); -+ TMainWindow(BRect frame, BString * songDirectory = NULL); - ~TMainWindow(); - - -diff --git a/main.cpp b/main.cpp -index 6e9a650..da8d16b 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -3,13 +3,22 @@ - * Toxic Labs - */ - -+#include - #include "TApp.h" - - using namespace org::toxic; - - int main (int argc,char * argv[]) - { -- TApp app; -+ BString * UserSpecifiedSongDir; -+ UserSpecifiedSongDir = NULL; -+ // see if song directory was specified -+ if(argc > 1) -+ { -+ UserSpecifiedSongDir = new BString(argv[1]); -+ } -+ -+ TApp app(UserSpecifiedSongDir); - - app.Run(); - --- -1.8.3.4 - From 3612c0b18fe57f7da4293b323383cc4fa1f386e3 Mon Sep 17 00:00:00 2001 From: noryb009 Date: Mon, 9 Dec 2013 18:58:01 -0500 Subject: [PATCH 02/23] Update BeScreenCapture's recipe New version came out --- ...escreencapture-1.9.1.recipe => bescreencapture-1.9.2.recipe} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename haiku-apps/bescreencapture/{bescreencapture-1.9.1.recipe => bescreencapture-1.9.2.recipe} (90%) diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe similarity index 90% rename from haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe rename to haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe index a0bfb4b3a..15214bdd1 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.1.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe @@ -8,7 +8,7 @@ DESCRIPTION=" section you select. " HOMEPAGE="https://github.com/jackburton79/bescreencapture" -SRC_URI="git+git://github.com/jackburton79/bescreencapture.git#87886da2972fd4bbabb3fc5caae301c6dc14e7fd" +SRC_URI="git://github.com/jackburton79/bescreencapture.git#fb7de7c5dec3768509072e3f3ee2a433bc9285bb" LICENSE=" BSD (3-clause) MIT From eea796df3c3b478c26293ed39f6a11111f3a8873 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 10 Dec 2013 22:59:31 +0100 Subject: [PATCH 03/23] pe: Update to hg614 * Fixes build: - pcre detection - B_COMMON_*_DIRECTORY constants * Fixes find function dialog (functions were missing). * Patches pe-2.4.3_hg611.patch and pe-2.4.3_hg611.patch2 are no longer needed for this version. Patch pe-2.4.3_hg611.patch3 has not been upstreamed as it misses a copyright header in the added file. * Remove pcre version requirement. AFAICT ">= 1" is not necessary and the previous ">= 0.0.1" was superfluous, since that's the earliest packaged version we have anyway. --- haiku-apps/pe/pe-2.4.3_hg614.recipe | 72 +++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 haiku-apps/pe/pe-2.4.3_hg614.recipe diff --git a/haiku-apps/pe/pe-2.4.3_hg614.recipe b/haiku-apps/pe/pe-2.4.3_hg614.recipe new file mode 100644 index 000000000..bf1a6eb7a --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg614.recipe @@ -0,0 +1,72 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " + +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " + +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#614" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku + lib:libpcre + lib:libpcreposix + " + +BUILD_REQUIRES=" + devel:libpcre + devel:libpcreposix + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +PATCHES=" + pe-2.4.3_hg611.patch3 + " + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} From 4acaf392337d0263789b5b7674ee58c648bee507 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 10 Dec 2013 22:49:27 +0000 Subject: [PATCH 04/23] Update burnitnow to latest build --- haiku-apps/burnitnow/burnitnow-trunk.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe index 55cebb202..e772c93fa 100644 --- a/haiku-apps/burnitnow/burnitnow-trunk.recipe +++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe @@ -1,15 +1,15 @@ SUMMARY="A utility for burning CD" DESCRIPTION="BurnItNow is a CD burning utility application for Haiku" HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" -SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#3e7e69d048" +SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#a790db9a87" REVISION="1" COPYRIGHT=" 2010-2013 BurnItNow Team " LICENSE="MIT" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" burnitnow = $portVersion @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix " -SOURCE_DIR="$portName/burnitnow2" +#SOURCE_DIR="$portName/burnitnow2" BUILD() { From aa3cc9a55c8b4b97ca7142add7ab21f1dd3a595d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 01:39:55 +0100 Subject: [PATCH 05/23] Mark as untested (not compiling yet) --- app-shells/fish/fish-1.23.1_git.recipe | 4 ++-- dev-vcs/fossil/fossil-1.27.recipe | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe index fb9dcb511..9a9a2b1c7 100644 --- a/app-shells/fish/fish-1.23.1_git.recipe +++ b/app-shells/fish/fish-1.23.1_git.recipe @@ -7,7 +7,7 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2005-2009 Axel Liljencrantz" -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="?x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -15,7 +15,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" fish$secondaryArchSuffix = $portVersion diff --git a/dev-vcs/fossil/fossil-1.27.recipe b/dev-vcs/fossil/fossil-1.27.recipe index e5f54064e..a1f1184d1 100644 --- a/dev-vcs/fossil/fossil-1.27.recipe +++ b/dev-vcs/fossil/fossil-1.27.recipe @@ -7,7 +7,7 @@ REVISION="1" LICENSE="BSD (2-clause)" COPYRIGHT="2007 D. Richard Hipp" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" fossil = $portVersion From 8b4d4f88dd9115a1322b397a133412ff3782b86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 01:40:58 +0100 Subject: [PATCH 06/23] ocp: Untested on x86_64 --- media-sound/ocp/ocp-0.1.21_git.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index 1ddf369e2..f613f289b 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others" ## media-libs/flac >= 1.2.1" ## ncurses zlib ... cf. ocp.spec -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -51,6 +51,7 @@ BUILD_PREREQUIRES=" " #XXX: this one pulls gcc2 SDL package in... which we don't need # cmd:sdl_config +# cmd:sdl_config$secondaryArchSuffix SOURCE_DIR="code" From d4c891368f4ffb8316251d54dbc64ad8ea921022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 06:50:19 +0100 Subject: [PATCH 07/23] libsdl: Account for secondary arch on provided cmd:sdl_config --- media-libs/libsdl/libsdl-1.2.15.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 6e04a168a..dc4a603f6 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -148,7 +148,7 @@ TEST() PROVIDES_devel=" libsdl${secondaryArchSuffix}_devel = 1.2.15 compat >= 1.2 - cmd:sdl_config = $portVersion compat >= 1.2 + cmd:sdl_config$secondaryArchSuffix = $portVersion compat >= 1.2 devel:libSDL$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 devel:libSDLmain$secondaryArchSuffix = 1.2_0.11.4 compat >= 1.2_0 devel:libSDL_1.2$secondaryArchSuffix = 0.11.4 compat >= 0 From 9e2e19ae35a22c8e10af3b29469a23cf376fddfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 07:33:37 +0100 Subject: [PATCH 08/23] ocp: Add sdl-config to prerequires correctly --- media-sound/ocp/ocp-0.1.21_git.recipe | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index f613f289b..e1180435b 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -48,11 +48,8 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix + cmd:sdl_config$secondaryArchSuffix " -#XXX: this one pulls gcc2 SDL package in... which we don't need -# cmd:sdl_config -# cmd:sdl_config$secondaryArchSuffix - SOURCE_DIR="code" From 647eb3b8f86f012e80f71d408810ecbcd8126ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 07:34:21 +0100 Subject: [PATCH 09/23] ocp: Mark untested for now as it fails to compile Some newly added asm code seems to have issue with PIC. --- media-sound/ocp/ocp-0.1.21_git.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index e1180435b..09556c7fa 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others" ## media-libs/flac >= 1.2.1" ## ncurses zlib ... cf. ocp.spec -ARCHITECTURES="x86 ?x86_64" +ARCHITECTURES="?x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -20,7 +20,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" ocp$secondaryArchSuffix = $portVersion From 451d3654ee56b0e8c98a17d75387dad5552ff888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 09:39:31 +0100 Subject: [PATCH 10/23] pkg-config: Allow secondary arch builds Since it hardcodes the search paths inside the binary, either we must make a secondary arch build of it for _x86 ports, either we could export a patched PKG_CONFIG_LIBDIR from haikuporter 's environment... but this seems to work anyway. --- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index 8f541f9a3..852955849 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -7,28 +7,29 @@ SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz" CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2" REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="pkgconfig-0.27.1.patchset" PROVIDES=" - pkgconfig = $portVersion compat >= 0.27 - cmd:pkg_config = $portVersion compat >= 0.27 + pkgconfig$secondaryArchSuffix = $portVersion compat >= 0.27 + cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27 " REQUIRES=" - haiku >= $haikuVersion - lib:libiconv + haiku$secondaryArchSuffix >= $haikuVersion + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libiconv + devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake cmd:autoreconf - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " @@ -46,7 +47,7 @@ BUILD() autoconf automake --add-missing - pcPathSubdir="develop/lib/pkgconfig" + pcPathSubdir="develop/lib${secondaryArchSuffix/_//}/pkgconfig" pcPath="/boot/home/config/non-packaged/$pcPathSubdir" pcPath="$pcPath:/boot/home/config/$pcPathSubdir" pcPath="$pcPath:/boot/system/$pcPathSubdir" From ef7b9215e79883769b17f359ecf17d422c991681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 09:43:49 +0100 Subject: [PATCH 11/23] ocp: prerequire pkg_config* OCP actually uses pkg-config to detect SDL, so we require the secondary arch version of it to make sure it searches the correct pc files. Tested on x86. --- media-sound/ocp/ocp-0.1.21_git.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index 09556c7fa..d6d20892a 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others" ## media-libs/flac >= 1.2.1" ## ncurses zlib ... cf. ocp.spec -ARCHITECTURES="?x86 ?x86_64" +ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. @@ -20,7 +20,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" ocp$secondaryArchSuffix = $portVersion @@ -48,6 +48,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix cmd:sdl_config$secondaryArchSuffix " @@ -58,7 +59,6 @@ SOURCE_DIR="code" BUILD() { autoconf - export CFLAGS="$(sdl-config --cflags)" ./configure --prefix=$prefix make } From eb5114d03ee6c3697feb040a2d93d155e4b32d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 10:03:24 +0100 Subject: [PATCH 12/23] ocp: use runConfigure Although it still installs things to share/ --- media-sound/ocp/ocp-0.1.21_git.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index d6d20892a..7dd91f191 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -54,12 +54,10 @@ BUILD_PREREQUIRES=" SOURCE_DIR="code" -# TODO: fix configure.ac to use sdl-config -# XXX: dwmixfa_8087.c:39:2: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' BUILD() { autoconf - ./configure --prefix=$prefix + runConfigure ./configure make } From ada79a00a765eeb5548afe9a805f34fe8714488e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 12:16:30 +0100 Subject: [PATCH 13/23] util-macros: Fix recipe It seems it wants to install the .pc file into data/... Manually fixed for now. --- .../util_macros/util_macros-1.17.0_git.recipe | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/x11-misc/util_macros/util_macros-1.17.0_git.recipe b/x11-misc/util_macros/util_macros-1.17.0_git.recipe index 8f7f416d5..22926812b 100644 --- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe +++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe @@ -1,3 +1,4 @@ +SUMMARY="xorg util-macros" DESCRIPTION="xorg util-macros" HOMEPAGE="http://cgit.freedesktop.org/xorg/util/macros/" COPYRIGHT="2005 Red Hat, Inc. @@ -7,19 +8,42 @@ LICENSE="MIT" SRC_URI="git://anongit.freedesktop.org/xorg/util/macros" #CHECKSUM_MD5="" REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + util_macros$secondaryArchSuffix = $portVersion + devel:util_macros$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + + BUILD() { - cd util-macros-1.17.0-git ./autogen.sh -V - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_LIB_DIRECTORY` + runConfigure ./configure make } INSTALL() { - cd util-macros-1.17.0-git make install + #fixPkgconfig + mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//} + mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/ } From a5a9b7bbc2e6db6c7d95547e7fdda7e82ad0dc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 12:31:19 +0100 Subject: [PATCH 14/23] xproto: Fix recipe --- x11-proto/xproto/xproto-7.0.23_git.recipe | 38 +++++++++++++++++++---- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/x11-proto/xproto/xproto-7.0.23_git.recipe b/x11-proto/xproto/xproto-7.0.23_git.recipe index 1d808c8c7..f3b239bd7 100644 --- a/x11-proto/xproto/xproto-7.0.23_git.recipe +++ b/x11-proto/xproto/xproto-7.0.23_git.recipe @@ -1,3 +1,4 @@ +SUMMARY="xproto" DESCRIPTION="xproto" HOMEPAGE="http://cgit.freedesktop.org/xorg/proto/xproto/" COPYRIGHT="1991, Oracle and/or its affiliates. All rights reserved. @@ -11,19 +12,44 @@ LICENSE="MIT (no promotion)" SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto" #CHECKSUM_MD5="" REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" + +PATCHES="xproto-7.0.23_git.patch" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + xproto$secondaryArchSuffix = $portVersion + devel:xproto$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + BUILD() { - cd xproto-7.0.23-git ./autogen.sh -V - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_LIB_DIRECTORY` + runConfigure ./configure make } INSTALL() { - cd xproto-7.0.23-git make install + fixPkgconfig } From 64d6873caaa1af2565403327ece2cb7b98597c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 12:33:37 +0100 Subject: [PATCH 15/23] libx11: rename to lowercase --- .../{libX11/libX11-1.3.3.recipe => libx11/libx11-1.3.3.recipe} | 0 .../libX11-1.3.3.patch => libx11/patches/libx11-1.3.3.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename x11-libs/{libX11/libX11-1.3.3.recipe => libx11/libx11-1.3.3.recipe} (100%) rename x11-libs/{libX11/patches/libX11-1.3.3.patch => libx11/patches/libx11-1.3.3.patch} (100%) diff --git a/x11-libs/libX11/libX11-1.3.3.recipe b/x11-libs/libx11/libx11-1.3.3.recipe similarity index 100% rename from x11-libs/libX11/libX11-1.3.3.recipe rename to x11-libs/libx11/libx11-1.3.3.recipe diff --git a/x11-libs/libX11/patches/libX11-1.3.3.patch b/x11-libs/libx11/patches/libx11-1.3.3.patch similarity index 100% rename from x11-libs/libX11/patches/libX11-1.3.3.patch rename to x11-libs/libx11/patches/libx11-1.3.3.patch From cb94f04d85cc0dee16ed70b83541185c0599a8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 14:02:40 +0100 Subject: [PATCH 16/23] xextproto: Fix recipe --- x11-proto/xextproto/xextproto-7.1.1.recipe | 44 +++++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe index 224d93786..7fab39b0f 100644 --- a/x11-proto/xextproto/xextproto-7.1.1.recipe +++ b/x11-proto/xextproto/xextproto-7.1.1.recipe @@ -1,21 +1,55 @@ +SUMMARY="xextproto" DESCRIPTION="xextproto" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.gz" CHECKSUM_MD5="6c55283718dbeb826bcf899b9e89faba" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0" +COPYRIGHT="1989, 1998 The Open Group + 1997 by Silicon Graphics Computer Systems, Inc. + 1992 Network Computing Devices + 1994, 1995 Hewlett-Packard Company + 1996 Digital Equipment Corporation, Maynard, Massachusetts. + 1988, 1989, 1990, 1994 Network Computing Devices, Inc. + 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts, and Olivetti Research Limited, Cambridge, England. + 1986, 1987, 1988 by Hewlett-Packard Corporation + 2007-2008 Peter Hutterer" +LICENSE="MIT (no promotion)" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + xextproto$secondaryArchSuffix = $portVersion + devel:xextproto$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix >= 1.7.0 + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " BUILD() { - cd xextproto-7.1.1 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure } INSTALL() { - cd xextproto-7.1.1 make install + fixPkgconfig } From c5b4a238d82bfbddf494851b0ffe8372c73639de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 14:10:20 +0100 Subject: [PATCH 17/23] xtrans: Fix recipe --- x11-libs/xtrans/xtrans-1.2.5.recipe | 46 ++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe index fb109065a..24967005b 100644 --- a/x11-libs/xtrans/xtrans-1.2.5.recipe +++ b/x11-libs/xtrans/xtrans-1.2.5.recipe @@ -1,23 +1,53 @@ +SUMMARY="xtrans" DESCRIPTION="xtrans" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz" CHECKSUM_MD5="b2f47d49faf1f24e8294b624b21b9b93" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23 - x11-misc/util-macros >= 1.7.0" - +COPYRIGHT="1993, 1994, 1998 The Open Group + 1993, 1994 NCR Corporation - Dayton, Ohio, USA + 2002, 2005 Sun Microsystems, Inc. All rights reserved. + Copyright 1996 by Sebastien Marineau and Holger Veit + 2003 Keith Packard, Noah Levitt" +LICENSE="MIT (no promotion)" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + xtrans$secondaryArchSuffix = $portVersion + devel:xtrans$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + + BUILD() { - cd xtrans-1.2.5 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` + runConfigure ./configure } INSTALL() { - cd xtrans-1.2.5 make install + mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//} + mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/ } From 9d8c3bf4dc8f7b4108b334f9dc76e342afe6e879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 14:15:57 +0100 Subject: [PATCH 18/23] inputproto: Fix recipe --- x11-proto/inputproto/inputproto-2.0.recipe | 39 +++++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe index 6d461f68d..3835d78cb 100644 --- a/x11-proto/inputproto/inputproto-2.0.recipe +++ b/x11-proto/inputproto/inputproto-2.0.recipe @@ -1,21 +1,50 @@ +SUMMARY="inputproto" DESCRIPTION="inputproto" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.gz" CHECKSUM_MD5="13d91739cf70a781f1db24d8d3677574" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0" +COPYRIGHT="1989, 1998 The Open Group + 1989 by Hewlett-Packard Company, Palo Alto, California. + " +LICENSE="MIT (no promotion)" + + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + inputproto$secondaryArchSuffix = $portVersion + devel:inputproto$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " BUILD() { - cd inputproto-2.0 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure } INSTALL() { - cd inputproto-2.0 make install + fixPkgconfig } From 70300aeb7e14e5391161f53c843265ea1595553a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 14:20:48 +0100 Subject: [PATCH 19/23] kbproto: Fix recipe --- x11-proto/kbproto/kbproto-1.0.4.recipe | 36 ++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe index 970e88e87..4632636d4 100644 --- a/x11-proto/kbproto/kbproto-1.0.4.recipe +++ b/x11-proto/kbproto/kbproto-1.0.4.recipe @@ -1,21 +1,47 @@ +SUMMARY="kbproto" DESCRIPTION="kbproto" HOMEPAGE="http://xorg.freedesktop.org/releases/individual/proto/" SRC_URI="http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.4.tar.gz" CHECKSUM_MD5="4deef518a03bc94a7a25902bb7c98dd6" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0" +COPYRIGHT="1993 by Silicon Graphics Computer Systems, Inc." +LICENSE="MIT" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + kbproto$secondaryArchSuffix = $portVersion + devel:kbproto$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " BUILD() { - cd kbproto-1.0.4 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure } INSTALL() { - cd kbproto-1.0.4 make install + fixPkgconfig } From 052e8b72571357c9726bb3cf2555f3a569b197bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 14:34:48 +0100 Subject: [PATCH 20/23] xcb_proto: Update recipe Somehow haikuporter doesn't want to unpack the tgz on this one... maybe due to the dash in the name!? --- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 33 ++++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index 6573458f7..ef75f9cef 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -1,22 +1,45 @@ +SUMMARY="xcb-proto" DESCRIPTION="xcb-proto" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.gz" CHECKSUM_MD5="8d29695e8faf5fcdce568c66eaeaa5ee" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + xcb_proto$secondaryArchSuffix = $portVersion + devel:xcb_proto$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " BUILD() { - cd xcb-proto-1.6 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure make } INSTALL() { - cd xcb-proto-1.6 make install } From 0d48fda7ba9378735138733f29db868c5cb29f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 14:46:37 +0100 Subject: [PATCH 21/23] libxau: Rename to lowercase --- .../{libXau/libXau-1.0.5.recipe => libxau/libxau-1.0.5.recipe} | 0 .../libXau-1.0.5.patch => libxau/patches/libxau-1.0.5.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename x11-libs/{libXau/libXau-1.0.5.recipe => libxau/libxau-1.0.5.recipe} (100%) rename x11-libs/{libXau/patches/libXau-1.0.5.patch => libxau/patches/libxau-1.0.5.patch} (100%) diff --git a/x11-libs/libXau/libXau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe similarity index 100% rename from x11-libs/libXau/libXau-1.0.5.recipe rename to x11-libs/libxau/libxau-1.0.5.recipe diff --git a/x11-libs/libXau/patches/libXau-1.0.5.patch b/x11-libs/libxau/patches/libxau-1.0.5.patch similarity index 100% rename from x11-libs/libXau/patches/libXau-1.0.5.patch rename to x11-libs/libxau/patches/libxau-1.0.5.patch From c711112a79b01cbd5c1f7ac84c9a23c31b751dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 15:36:00 +0100 Subject: [PATCH 22/23] xcb_proto: Better add SOURCE_DIR for this one... --- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index ef75f9cef..190bd056d 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -4,6 +4,8 @@ HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.gz" CHECKSUM_MD5="8d29695e8faf5fcdce568c66eaeaa5ee" REVISION="1" +COPYRIGHT="2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett." +LICENSE="MIT (no promotion)" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -29,8 +31,11 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix + cmd:python$secondaryArchSuffix " +SOURCE_DIR="xcb-proto-$portVersion" + BUILD() { libtoolize --force --copy --install From bd1889d9e48d6f405096d31613c70c555f57cdfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 15:41:47 +0100 Subject: [PATCH 23/23] libpthread_stubs: 0.3.2 doesn't exist. Update 0.3 recipe --- .../libpthread_stubs-0.3.2.recipe | 21 ----------- .../libpthread_stubs-0.3.recipe | 36 ++++++++++++++++--- 2 files changed, 31 insertions(+), 26 deletions(-) delete mode 100644 dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe deleted file mode 100644 index 7d65949e3..000000000 --- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="libpthread-stubs" -HOMEPAGE="http://xcb.freedesktop.org/" -SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz" -CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD() -{ - cd libpthread-stubs-0.3 - libtoolize --force --copy --install - autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpthread-stubs-0.3 - make install -} diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe index 7d65949e3..97125d651 100644 --- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe +++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe @@ -1,21 +1,47 @@ +SUMMARY="libpthread-stubs" DESCRIPTION="libpthread-stubs" HOMEPAGE="http://xcb.freedesktop.org/" SRC_URI="http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz" CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libpthread_stubs$secondaryArchSuffix = $portVersion + devel:libpthread_stubs$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:util_macros$secondaryArchSuffix + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +SOURCE_DIR="libpthread-stubs-$portVersion" + BUILD() { - cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + runConfigure ./configure make } INSTALL() { - cd libpthread-stubs-0.3 make install }