diff --git a/dev-libs/libgpg_error/libgpg_error-1.12.recipe b/dev-libs/libgpg_error/libgpg_error-1.12.recipe deleted file mode 100644 index 234427854..000000000 --- a/dev-libs/libgpg_error/libgpg_error-1.12.recipe +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY="A library that defines common error values" -DESCRIPTION=" -This is a library that defines common error values for all GnuPG components. \ -Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, \ -Pinentry, SmartCard Daemon and more. -" -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2003-2013 g10 Code GmbH" -HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error" -SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.12.tar.bz2" -CHECKSUM_SHA256="cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f" -REVISION="2" -ARCHITECTURES="x86" - -PROVIDES=" - libgpg_error = $portVersion compat >= 1 - lib:libgpg_error = 0.10.0 compat >= 0 - cmd:gpg_error = $portVersion compat >= 1 - " - -REQUIRES=" - haiku >= $haikuVersion - " - -BUILD_REQUIRES=" - haiku_devel >= $haikuVersion - " - -BUILD_PREREQUIRES=" - cmd:awk - cmd:make - cmd:gcc - " - -SOURCE_DIR="libgpg-error-$portVersion" - -PATCHES="libgpg_error-$portVersion.patch" - -BUILD() -{ - runConfigure ./configure - make -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libgpg-error - - packageEntries devel \ - $developDir $binDir/gpg-error-config -} - -PROVIDES_devel=" - libgpg_error_devel = $portVersion compat >= 1 - cmd:gpg_error_config = $portVersion compat >= 1 - devel:libgpg_error = 0.10.0 compat >= 0 - " - -REQUIRES_devel=" - libgpg_error == $portVersion - " diff --git a/dev-libs/libgpg_error/libgpg_error-1.13.recipe b/dev-libs/libgpg_error/libgpg_error-1.13.recipe deleted file mode 100644 index 3f7da5d49..000000000 --- a/dev-libs/libgpg_error/libgpg_error-1.13.recipe +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY="A library that defines common error values" -DESCRIPTION=" -This is a library that defines common error values for all GnuPG components. \ -Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, \ -Pinentry, SmartCard Daemon and more. -" -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2003-2013 g10 Code GmbH" -HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error" -SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$portVersion.tar.bz2" -CHECKSUM_SHA256="f8aba9038d8a46cefe6a6c4a7e4527144c029eb4e3ca1ed27011b962102c9b0a" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - libgpg_error$secondaryArchSuffix = $portVersion compat >= 1 - lib:libgpg_error$secondaryArchSuffix = 0.11.0 compat >= 0 - cmd:gpg_error$secondaryArchSuffix = $portVersion compat >= 1 - " - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " - -BUILD_PREREQUIRES=" - cmd:awk - cmd:make - cmd:gcc$secondaryArchSuffix - " - -SOURCE_DIR="libgpg-error-$portVersion" - -PATCHES="libgpg_error-$portVersion.patchset" - -BUILD() -{ - runConfigure ./configure - make -} - -INSTALL() -{ - make install - - prepareInstalledDevelLibs libgpg-error - - packageEntries devel \ - $developDir $binDir/gpg-error-config -} - -PROVIDES_devel=" - libgpg_error${secondaryArchSuffix}_devel = $portVersion compat >= 1 - cmd:gpg_error_config$secondaryArchSuffix = $portVersion compat >= 1 - devel:libgpg_error$secondaryArchSuffix = 0.11.0 compat >= 0 - " - -REQUIRES_devel=" - libgpg_error$secondaryArchSuffix == $portVersion - " diff --git a/dev-libs/libgpg_error/libgpg_error-1.15.recipe b/dev-libs/libgpg_error/libgpg_error-1.17.recipe similarity index 87% rename from dev-libs/libgpg_error/libgpg_error-1.15.recipe rename to dev-libs/libgpg_error/libgpg_error-1.17.recipe index e4d7ac569..35186975f 100644 --- a/dev-libs/libgpg_error/libgpg_error-1.15.recipe +++ b/dev-libs/libgpg_error/libgpg_error-1.17.recipe @@ -8,14 +8,14 @@ LICENSE="GNU LGPL v2.1" COPYRIGHT="2003-2013 g10 Code GmbH" HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error" SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$portVersion.tar.bz2" -CHECKSUM_SHA256="b6083d027ca338f2a090ac9539983bc847596d36200f6baf3451f2688209797f" +CHECKSUM_SHA256="3ff4e5a71116eb862cd14185fcd282850927b8608e3b4186834fd940fbef57b5" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" libgpg_error$secondaryArchSuffix = $portVersion compat >= 1 - lib:libgpg_error$secondaryArchSuffix = 0.11.0 compat >= 0 + lib:libgpg_error$secondaryArchSuffix = 0.13.0 compat >= 0 cmd:gpg_error$secondaryArchSuffix = $portVersion compat >= 1 " @@ -56,7 +56,7 @@ INSTALL() PROVIDES_devel=" libgpg_error${secondaryArchSuffix}_devel = $portVersion compat >= 1 cmd:gpg_error_config$secondaryArchSuffix = $portVersion compat >= 1 - devel:libgpg_error$secondaryArchSuffix = 0.11.0 compat >= 0 + devel:libgpg_error$secondaryArchSuffix = 0.13.0 compat >= 0 " REQUIRES_devel=" diff --git a/dev-libs/libgpg_error/patches/libgpg_error-1.12.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.12.patch deleted file mode 100644 index 824e90fb6..000000000 --- a/dev-libs/libgpg_error/patches/libgpg_error-1.12.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libgpg-error-1.12/src/mkerrcodes2.awk 2008-08-26 12:45:58.010747904 +0000 -+++ libgpg-error-1.12-haiku/src/mkerrcodes2.awk 2012-04-09 16:59:18.363855872 +0000 -@@ -81,7 +81,7 @@ - /^#/ { next; } - - header { -- if ($1 ~ /^[0123456789]+$/) -+ if ($1 ~ /^-?[0123456789]+$/) - { - print "static const int err_code_from_index[] = {"; - header = 0; diff --git a/dev-libs/libgpg_error/patches/libgpg_error-1.15.patchset b/dev-libs/libgpg_error/patches/libgpg_error-1.15.patchset deleted file mode 100644 index 7b53cb2b4..000000000 --- a/dev-libs/libgpg_error/patches/libgpg_error-1.15.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 704f5695c327d67f550795e82004889717cf6ab9 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 5 Aug 2014 16:25:46 +0000 -Subject: haiku patch - - -diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk -index ea58503..93cfef2 100644 ---- a/src/mkerrcodes2.awk -+++ b/src/mkerrcodes2.awk -@@ -81,7 +81,7 @@ BEGIN { - /^#/ { next; } - - header { -- if ($1 ~ /^[0123456789]+$/) -+ if ($1 ~ /^-?[0123456789]+$/) - { - print "static const int err_code_from_index[] = {"; - header = 0; --- -1.8.3.4 - diff --git a/dev-libs/libgpg_error/patches/libgpg_error-1.13.patchset b/dev-libs/libgpg_error/patches/libgpg_error-1.17.patchset similarity index 100% rename from dev-libs/libgpg_error/patches/libgpg_error-1.13.patchset rename to dev-libs/libgpg_error/patches/libgpg_error-1.17.patchset