diff --git a/app-editors/nano/nano-2.4.2.recipe b/app-editors/nano/nano-2.4.2.recipe index 177007ac2..eee15e43d 100644 --- a/app-editors/nano/nano-2.4.2.recipe +++ b/app-editors/nano/nano-2.4.2.recipe @@ -12,7 +12,7 @@ functionality. Features include: HOMEPAGE="http://www.nano-editor.org/" COPYRIGHT="1999-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://www.nano-editor.org/dist/v2.4/nano-$portVersion.tar.gz" CHECKSUM_SHA256="c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9" PATCHES="nano-$portVersion.patchset" diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe index edb54c806..8787cf385 100644 --- a/app-editors/vim/vim-7.4.recipe +++ b/app-editors/vim/vim-7.4.recipe @@ -45,8 +45,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - ncurses_devel - gettext + devel:libncurses " BUILD_PREREQUIRES=" cmd:make @@ -55,6 +54,7 @@ BUILD_PREREQUIRES=" cmd:find cmd:grep cmd:sed + cmd:gettext " BUILD() diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe index 7dda2eebc..23ffdea7e 100644 --- a/app-text/aspell/aspell-0.60.6.1.recipe +++ b/app-text/aspell/aspell-0.60.6.1.recipe @@ -29,8 +29,8 @@ PROVIDES=" cmd:pspell_config$secondaryArchSuffix = $portVersion compat >= 0.60 cmd:run_with_aspell$secondaryArchSuffix = $portVersion compat >= 0.60 cmd:word_list_compress$secondaryArchSuffix = $portVersion compat >= 0.60 - lib:libaspell$secondaryArchSuffix = $portVersion compat >= 0.15 - lib:libpspell$secondaryArchSuffix = $portVersion compat >= 0.15 + lib:libaspell$secondaryArchSuffix = 15.1.5 compat >= 15 + lib:libpspell$secondaryArchSuffix = 15.1.5 compat >= 15 " REQUIRES=" @@ -55,7 +55,8 @@ BUILD_PREREQUIRES=" PROVIDES_devel=" aspell${secondaryArchSuffix}_devel = $portVersion compat >= 0.60 - devel:libpspell$secondaryArchSuffix = $portVersion compat >= 0.15 + devel:libaspell$secondaryArchSuffix = 15.1.5 compat >= 15 + devel:libpspell$secondaryArchSuffix = 15.1.5 compat >= 15 " REQUIRES_devel=" @@ -74,13 +75,16 @@ BUILD() autoconf automake runConfigure ./configure \ - --enable-dict-dir=$dataDir/aspell-0.60 + --enable-dict-dir=$dataDir/aspell-0.60 make } INSTALL() { make install + + rm $libDir/*.la + prepareInstalledDevelLibs libaspell libpspell packageEntries devel $developDir } diff --git a/dev-lang/python/python-2.7.10.recipe b/dev-lang/python/python-2.7.10.recipe index f5d08fb62..aad416d36 100644 --- a/dev-lang/python/python-2.7.10.recipe +++ b/dev-lang/python/python-2.7.10.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" diff --git a/dev-lang/ruby/ruby-2.2.2.recipe b/dev-lang/ruby/ruby-2.2.2.recipe index 6f58f3a68..97f65bc54 100644 --- a/dev-lang/ruby/ruby-2.2.2.recipe +++ b/dev-lang/ruby/ruby-2.2.2.recipe @@ -17,7 +17,7 @@ LICENSE="Ruby COPYRIGHT="1993-2015 Yukihiro Matsumoto" PATCHES="ruby-$portVersion.patchset" -REVISION="2" +REVISION="3" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/dev-libs/libedit/libedit-2015_03_21_3.1.recipe b/dev-libs/libedit/libedit-2015_03_21_3.1.recipe index d55e7aad6..39a31ed73 100644 --- a/dev-libs/libedit/libedit-2015_03_21_3.1.recipe +++ b/dev-libs/libedit/libedit-2015_03_21_3.1.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1992-2014 The NetBSD Foundation, Inc." HOMEPAGE="http://www.thrysoee.dk/editline/" SOURCE_URI="http://www.thrysoee.dk/editline/libedit-20150325-3.1.tar.gz" CHECKSUM_SHA256="c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 6a3114c9a..eecc75c93 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -23,7 +23,7 @@ files." HOMEPAGE="http://lame.sourceforge.net/" COPYRIGHT="1998-2012 Mike Cheng et al." LICENSE="GNU LGPL v2" -REVISION="5" +REVISION="6" SOURCE_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-$portVersion.tar.gz" CHECKSUM_SHA256="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff" PATCHES="lame-$portVersion.patch" diff --git a/net-libs/neon/neon-0.30.1.recipe b/net-libs/neon/neon-0.30.1.recipe index 626a3482d..41a1ccbcf 100644 --- a/net-libs/neon/neon-0.30.1.recipe +++ b/net-libs/neon/neon-0.30.1.recipe @@ -19,7 +19,7 @@ property manipulation." HOMEPAGE="http://www.webdav.org/neon/" COPYRIGHT="1999-2011 Joe Orton" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://www.webdav.org/neon/neon-$portVersion.tar.gz" CHECKSUM_SHA256="00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd" PATCHES="neon-0.29.6.patch" @@ -29,7 +29,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" neon$secondaryArchSuffix = $portVersion compat >= 0.29 - lib:libneon$secondaryArchSuffix = 27.3.1 compat >= 27.2 + lib:libneon$secondaryArchSuffix = 27.3.1 compat >= 27 " REQUIRES=" haiku$secondaryArchSuffix diff --git a/net-misc/openssh/openssh-7.1p1.recipe b/net-misc/openssh/openssh-7.1p1.recipe index 23f8199e2..a8b8937f0 100644 --- a/net-misc/openssh/openssh-7.1p1.recipe +++ b/net-misc/openssh/openssh-7.1p1.recipe @@ -16,7 +16,7 @@ ssh-keyscan, ssh-keygen and sftp-server." HOMEPAGE="http://www.openssh.com/" COPYRIGHT="2005-2015 Tatu Ylonen et al." LICENSE="OpenSSH" -REVISION="2" +REVISION="3" SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz" CHECKSUM_SHA256="fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428" PATCHES="sshd_config.patch diff --git a/sys-apps/less/less-458.recipe b/sys-apps/less/less-458.recipe index e06a4aba5..68decaa97 100644 --- a/sys-apps/less/less-458.recipe +++ b/sys-apps/less/less-458.recipe @@ -11,7 +11,7 @@ CHECKSUM_SHA256="e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fca PATCHES="less-$portVersion.patchset" LICENSE="GNU GPL v3" COPYRIGHT="1984-2014 Mark Nudelman" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index c9348cbf8..8f65416ce 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1992-2008 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_SHA256="1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68" -REVISION="7" +REVISION="8" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES="texinfo-4.13a.patch" diff --git a/sys-devel/gettext/gettext-0.19.6.recipe b/sys-devel/gettext/gettext-0.19.6.recipe index ceee5d495..e19a8bb65 100644 --- a/sys-devel/gettext/gettext-0.19.6.recipe +++ b/sys-devel/gettext/gettext-0.19.6.recipe @@ -18,7 +18,7 @@ LICENSE="GNU GPL v3" COPYRIGHT="1998, 2010 Free Software Foundation, Inc." SOURCE_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-$portVersion.tar.gz" CHECKSUM_SHA256="ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -97,7 +97,7 @@ INSTALL() make install AUTOCONF=: AUTOMAKE=: AUTOHEADER=: ACLOCAL=: rm $libDir/charset.alias - rm $libDir/libintl.la + rm $libDir/lib*.la prepareInstalledDevelLibs libasprintf libgettextpo libintl prepareInstalledDevelLib libgettextlib '*.so' '*' diff --git a/sys-libs/readline/readline-6.3.8.recipe b/sys-libs/readline/readline-6.3.8.recipe index d94bc31fe..f1c6ef640 100644 --- a/sys-libs/readline/readline-6.3.8.recipe +++ b/sys-libs/readline/readline-6.3.8.recipe @@ -11,7 +11,7 @@ Readline in applications which desire its capabilities." HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" COPYRIGHT="1989-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz" CHECKSUM_SHA256="56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" for i in {001..008}; do @@ -94,4 +94,4 @@ INSTALL() $dataDir \ $developDir \ $documentationDir -} \ No newline at end of file +}