diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe deleted file mode 100644 index f730bb5cb..000000000 --- a/dev-vcs/bzr/bzr-2.6.0.recipe +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY="A powerful distributed version control system" -DESCRIPTION="Bazaar (bzr) is a version control system that helps you track \ -project history over time and to collaborate easily with others. Whether \ -you're a single developer, a co-located team or a community of developers \ -scattered across the world, Bazaar scales and adapts to meet your needs. -Part of the GNU Project, Bazaar is free software sponsored by Canonical." -HOMEPAGE="http://bazaar.canonical.com" -COPYRIGHT="2005-2013 Canonical" -LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://launchpadlibrarian.net/145980211/bzr-2.6.0.tar.gz" -CHECKSUM_SHA256="0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0" -SOURCE_DIR="bzr-$portVersion" -if [ $effectiveTargetArchitecture = x86_gcc2 ]; then - PATCHES="bzr-2.6.0_gcc2.patchset" -fi - -ARCHITECTURES="!all x86_gcc2" - -PROVIDES=" - bzr = $portVersion compat >= 2.6.0 - cmd:bzr = $portVersion compat >= 2.6.0 - " -REQUIRES=" - haiku - lib:libpython2.7 - cmd:python - " - -BUILD_REQUIRES=" - haiku_devel - devel:libpython2.7 - " -BUILD_PREREQUIRES=" - cmd:python - cmd:gcc - cmd:ld - cmd:msgfmt - " - -BUILD() -{ - python setup.py build -} - -INSTALL() -{ - python setup.py install \ - --prefix=$prefix \ - --install-data=$manDir -} diff --git a/dev-vcs/bzr/bzr-2.7.0.recipe b/dev-vcs/bzr/bzr-2.7.0.recipe deleted file mode 100644 index dbd7fdb24..000000000 --- a/dev-vcs/bzr/bzr-2.7.0.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="A powerful distributed version control system" -DESCRIPTION="Bazaar (bzr) is a version control system that helps you track \ -project history over time and to collaborate easily with others. Whether \ -you're a single developer, a co-located team or a community of developers \ -scattered across the world, Bazaar scales and adapts to meet your needs. -Part of the GNU Project, Bazaar is free software sponsored by Canonical." -HOMEPAGE="https://bazaar.canonical.com" -COPYRIGHT="2005-2013 Canonical" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://launchpad.net/bzr/2.7/$portVersion/+download/bzr-$portVersion.tar.gz" -CHECKSUM_SHA256="0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3" -SOURCE_DIR="bzr-$portVersion" -PATCHES="bzr-$portVersion.patchset" - -ARCHITECTURES="all ?x86" - -PROVIDES=" - bzr = $portVersion compat >= 2.7.0 - cmd:bzr = $portVersion compat >= 2.7.0 - " -REQUIRES=" - haiku - cmd:python - lib:libpython2.7 - " - -BUILD_REQUIRES=" - haiku_devel - devel:libpython2.7 - " -BUILD_PREREQUIRES=" - cmd:gcc - cmd:ld - cmd:msgfmt - cmd:python - " - -BUILD() -{ - python setup.py build -} - -INSTALL() -{ - python setup.py install \ - --prefix=$prefix -} diff --git a/dev-vcs/bzr/patches/bzr-2.6.0_gcc2.patchset b/dev-vcs/bzr/patches/bzr-2.6.0_gcc2.patchset deleted file mode 100644 index 93380a258..000000000 --- a/dev-vcs/bzr/patches/bzr-2.6.0_gcc2.patchset +++ /dev/null @@ -1,64 +0,0 @@ -From b548f2d39f844eb8cba348b9d167635e99cc04e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Wed, 23 Jul 2014 22:29:50 +0200 -Subject: [PATCH 1/2] Use gcc2 zero-length array member - -gcc2 doesn't support C99 flexible array member. ---- - bzrlib/diff-delta.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/bzrlib/diff-delta.c b/bzrlib/diff-delta.c -index 0801c96..20aa9f2 100644 ---- a/bzrlib/diff-delta.c -+++ b/bzrlib/diff-delta.c -@@ -24,6 +24,12 @@ - #include - #include - -+# if defined(__GNUC__) && (__GNUC__ < 3) -+#define FLEX_ARRAY_LEN 0 -+#else -+#define FLEX_ARRAY_LEN -+#endif -+ - /* maximum hash entry list for the same hash bucket */ - #define HASH_LIMIT 64 - -@@ -151,7 +157,7 @@ struct delta_index { - entry */ - unsigned int num_entries; /* The total number of entries in this index */ - struct index_entry *last_entry; /* Pointer to the last valid entry */ -- struct index_entry *hash[]; -+ struct index_entry *hash[FLEX_ARRAY_LEN]; - }; - - static unsigned int --- -1.8.3.4 - - -From 296dc6b32944ccf5a56d6138617b24ae8a9b25d1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Sat, 26 Jul 2014 15:06:44 +0200 -Subject: [PATCH 2/2] Add default certificates location for Haiku - ---- - bzrlib/transport/http/_urllib2_wrappers.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/bzrlib/transport/http/_urllib2_wrappers.py b/bzrlib/transport/http/_urllib2_wrappers.py -index 6a8dabd..44d0a63 100644 ---- a/bzrlib/transport/http/_urllib2_wrappers.py -+++ b/bzrlib/transport/http/_urllib2_wrappers.py -@@ -86,6 +86,7 @@ _ssl_ca_certs_known_locations = [ - u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD - # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 - u'/etc/openssl/certs/ca-certificates.crt', # Solaris -+ u'/boot/system/data/ssl/CARootCertificates.pem', # Haiku - ] - def default_ca_certs(): - if sys.platform == 'win32': --- -1.8.3.4 - diff --git a/dev-vcs/bzr/patches/bzr-2.7.0.patchset b/dev-vcs/bzr/patches/bzr-2.7.0.patchset deleted file mode 100644 index 86aa4659d..000000000 --- a/dev-vcs/bzr/patches/bzr-2.7.0.patchset +++ /dev/null @@ -1,91 +0,0 @@ -From 26c866e6de99f4129d62ecfca552958af0a8ef18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Mon, 4 Jun 2018 09:14:57 +0200 -Subject: Use gcc2 zero-length array member - - -diff --git a/bzrlib/diff-delta.c b/bzrlib/diff-delta.c -index 0801c96..a0a8dc5 100644 ---- a/bzrlib/diff-delta.c -+++ b/bzrlib/diff-delta.c -@@ -24,6 +24,12 @@ - #include - #include - -+#if defined(__GNUC__) && (__GNUC__ < 3) -+# define FLEX_ARRAY_LEN 0 -+#else -+# define FLEX_ARRAY_LEN -+#endif -+ - /* maximum hash entry list for the same hash bucket */ - #define HASH_LIMIT 64 - -@@ -151,7 +157,7 @@ struct delta_index { - entry */ - unsigned int num_entries; /* The total number of entries in this index */ - struct index_entry *last_entry; /* Pointer to the last valid entry */ -- struct index_entry *hash[]; -+ struct index_entry *hash[FLEX_ARRAY_LEN]; - }; - - static unsigned int --- -2.16.4 - - -From d69b7dcc6e97abd5d2d8fc37e2cbf81fe636a86d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Mon, 4 Jun 2018 09:17:43 +0200 -Subject: Add default certificates location for Haiku - - -diff --git a/bzrlib/transport/http/_urllib2_wrappers.py b/bzrlib/transport/http/_urllib2_wrappers.py -index 8eb3fab..fa83cb9 100644 ---- a/bzrlib/transport/http/_urllib2_wrappers.py -+++ b/bzrlib/transport/http/_urllib2_wrappers.py -@@ -95,6 +95,7 @@ _ssl_ca_certs_known_locations = [ - u"/usr/local/share/certs/ca-root-nss.crt", # FreeBSD - # XXX: Needs checking, can't trust the interweb ;) -- vila 2012-01-25 - u'/etc/openssl/certs/ca-certificates.crt', # Solaris -+ u'/boot/system/data/ssl/CARootCertificates.pem', # Haiku - ] - - --- -2.16.4 - - -From c6f527043bfa756a1d3c3e8f40e1b69854266344 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Mon, 4 Jun 2018 15:22:11 +0200 -Subject: Adjust installation paths for man and locale files - - -diff --git a/setup.py b/setup.py -old mode 100755 -new mode 100644 -index 2f13c00..5a88691 ---- a/setup.py -+++ b/setup.py -@@ -76,7 +76,7 @@ PKG_DATA = {# install files from selftest suite - I18N_FILES = [] - for filepath in glob.glob("bzrlib/locale/*/LC_MESSAGES/*.mo"): - langfile = filepath[len("bzrlib/locale/"):] -- targetpath = os.path.dirname(os.path.join("share/locale", langfile)) -+ targetpath = os.path.dirname(os.path.join("data/locale", langfile)) - I18N_FILES.append((targetpath, [filepath])) - - def get_bzrlib_packages(): -@@ -763,7 +763,7 @@ else: - if not 'bdist_egg' in sys.argv: - # generate and install bzr.1 only with plain install, not the - # easy_install one -- DATA_FILES = [('man/man1', ['bzr.1'])] -+ DATA_FILES = [('documentation/man/man1', ['bzr.1'])] - - DATA_FILES = DATA_FILES + I18N_FILES - # std setup --- -2.16.4 -