From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- app-text/aspell/Manifest | 13 + app-text/aspell/aspell-0.60.6.1-r3.ebuild | 99 ++++++++ app-text/aspell/aspell-0.60.6.1-r4.ebuild | 89 +++++++ app-text/aspell/aspell-0.60.7_rc1.ebuild | 102 ++++++++ app-text/aspell/files/aspell-0.60.5-nls.patch | 13 + app-text/aspell/files/aspell-0.60.5-solaris.patch | 27 ++ .../files/aspell-0.60.6-darwin-bundles.patch | 35 +++ app-text/aspell/files/aspell-0.60.6.1-clang.patch | 47 ++++ .../aspell/files/aspell-0.60.6.1-unicode.patch | 276 +++++++++++++++++++++ app-text/aspell/metadata.xml | 4 + 10 files changed, 705 insertions(+) create mode 100644 app-text/aspell/Manifest create mode 100644 app-text/aspell/aspell-0.60.6.1-r3.ebuild create mode 100644 app-text/aspell/aspell-0.60.6.1-r4.ebuild create mode 100644 app-text/aspell/aspell-0.60.7_rc1.ebuild create mode 100644 app-text/aspell/files/aspell-0.60.5-nls.patch create mode 100644 app-text/aspell/files/aspell-0.60.5-solaris.patch create mode 100644 app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch create mode 100644 app-text/aspell/files/aspell-0.60.6.1-clang.patch create mode 100644 app-text/aspell/files/aspell-0.60.6.1-unicode.patch create mode 100644 app-text/aspell/metadata.xml (limited to 'app-text/aspell') diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest new file mode 100644 index 000000000000..d31586d7df46 --- /dev/null +++ b/app-text/aspell/Manifest @@ -0,0 +1,13 @@ +AUX aspell-0.60.5-nls.patch 443 SHA256 9c8a619f97ffcbb6a90bb5d5f0531d0890ca0033dcfae5b0fc70cb635df7b39c SHA512 579de3e40e6036701b02e0936cbe7a0aebfe09f5fef35241827d9a64eea024148d530cb1cd435d5c9307358940c1704309511cd633e45307546e7f5d30d97120 WHIRLPOOL be989a88515e94e00529d078301431b67bb07b9934c846c2856b6f386f41ce2ff58c86f218caa23df2f3824f5865b1e42b158c197500ad4aaab07c320c3d6ead +AUX aspell-0.60.5-solaris.patch 538 SHA256 7f43d10cd9dc36eabc3837f023ba1e2fe7588b833acac0b81b7e28c22635bf65 SHA512 0386e629e77335cc42529134104ed62980c7b1a7bedf1b1925f78a2bd014c0db5292520bdd75152233464806527956761aa4795e7201569a9dbe365386ea8418 WHIRLPOOL f99c6756f6efa2ef0b6e24eeb9710f59abf52144be929ee18a33932a8ef6f942a5627fc0ab2c250bfcf52c755017a6ba642b5b2a257ba8f45e2a917d649f781b +AUX aspell-0.60.6-darwin-bundles.patch 967 SHA256 bc12f8061e552576d55101c5614d3c653e9959bdadbab7a7cdaad5ad6e64863e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb WHIRLPOOL 4414f5c7b1c3a729dc36ba7d73abfb6b89b021a574782c072b81b1e65d654961c89148858ac3e055cb7b6b63981924991c683d61215043cb991225664be9162b +AUX aspell-0.60.6.1-clang.patch 1288 SHA256 dd2df4877cb783c39706801c8434151e61736a08d226f5c1e1de4a8df1c23019 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f WHIRLPOOL 44842bca3fd52ba141afb02b93fc334a40dc2e04378b7fe00176e5151f09c3a71131ebb63f976a1ad8b66b6546cec6c457c06598363f497fb60a3551a846937c +AUX aspell-0.60.6.1-unicode.patch 8273 SHA256 e3a4b5f65fa60a2a1467ad93e655ce8cac574ef9eca8ee937389b3753b26c154 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98 WHIRLPOOL e4afabdf50cb0a9baf100a704de5e71336833a505fc369338eed03278757093f03f2f1b209acf09b41e8e500264b752ef2d222cbc83d92867b6f32c2bc74435f +DIST aspell-0.60.6.1.tar.gz 1878163 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f WHIRLPOOL 0c77b95a29b598491c12cf22737d5ff758b2758b4f815356d2f52da398afe2b45209cd3b59f90e5b3c1976ee8a09e8cd553507bd93a0cd49043c8531f9a4990b +DIST aspell-0.60.7-rc1.tar.gz 2034916 SHA256 86b5662f24316142f70c5890787bdc5596625ca3604dfe85926ee61f27f2365e SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1 WHIRLPOOL 6c48decc0470827024584e0519de70a9b6ffbe1526617eb86614123161dfabcaad7ded9e3d73698ade427523370f7f52f46570bb8052c6502ed30ee4ce2a5799 +EBUILD aspell-0.60.6.1-r3.ebuild 2725 SHA256 c8cbfb7cd0f1c6c4597ace3b277c1b1a5c5644a05f419d7c460d2752de50556d SHA512 a67ef4a339427f65777ad9cbeb505b7dc1e1f154acc0096729db65df52e17894999846b9a07fa0aff1866629eedd5efb8c8c45b7fb64e74e640ad551e083f71b WHIRLPOOL 74b16928ef7f16a07b5bf82f8aa89f07ad46cff824fe77d94444318c2c87e0aea269d828f025ca06ab1bcd37f1fbbcd7db967649e710edf3a33bcc75fe5fefa3 +EBUILD aspell-0.60.6.1-r4.ebuild 2488 SHA256 cb6092d37d9ab0b3cc619963b6230ac166917eae7a5eb549e8a4a4da7a241b46 SHA512 413796f85ade231c4f8339c14870f8019a7f93fef7405324f37af25b888ee93038bb14e0aea4c57f1804bf973d00bb62d66172e395c62d2b9c095f6b21bfb97c WHIRLPOOL df447e013ba23356e106d32536429fc513d0933164e10408a46237ec6d510d78be444c42eada167aafac0c04d112f2ca6b930827df210c2304b6e9f048f849ba +EBUILD aspell-0.60.7_rc1.ebuild 2811 SHA256 5f8a05c51ea99a6ea617426590232449d70b68d58d92afcce3d5de2fcd668584 SHA512 f469187960a086b6ac6b701573dff240d9785cbf8a0674d28182b18d1d5de4dd8e40a51d628e8cc0cc7a9933f715d954aed5d60d333ba5dfd6cc8de27df5186f WHIRLPOOL 7503a12e4eb0a17d044f9f962136cf7cfcf7baa380394657c41c8c78b1444c4a6f9034caf5ba95b19dc3654c68f62bba61e50e0aa625d0532384a68d640aaefa +MISC ChangeLog 5600 SHA256 2936ca1196bc84c5354589a3662719381f9af31e22466b2b24f2f3b32e664faa SHA512 aed7e8c17e61957fcda7f1bd8443fab054aa3831b3820fba6c40d02e0efc0f90b26a7afb823f8c40412654aebb671b7c1d2479efe2cbb38de31e9a6d3a346156 WHIRLPOOL 98523ed47ac6fabf1595960a42859e08c39802cf5738a5f8f38ca3c03202f87dcf40412ac3b5d2313558caa632f502b78b60787046dc329b46fc178a4f38a98e +MISC ChangeLog-2015 23773 SHA256 db04f0d455485520f07c52667671a557dcc7e6a15ecc2647b54894fbae8658e9 SHA512 35496469308dbfcf5cf2d3001dde6fbe30955770526fa94a93ecfdc5d20f05aa6ce73a5083a3575ede5d095c188c3fd22c861bbbe6f4a2222cd37574d5d09566 WHIRLPOOL cc360c5510028899fa96e82c88b9c345a078311d47b7dcc0ae2e67379b9d38e4a9afa18b7f61045967ae34e81f3488c569f738456de9e1f8b42e267b9dd7fc21 +MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630 diff --git a/app-text/aspell/aspell-0.60.6.1-r3.ebuild b/app-text/aspell/aspell-0.60.6.1-r3.ebuild new file mode 100644 index 000000000000..7c6d6d12527d --- /dev/null +++ b/app-text/aspell/aspell-0.60.6.1-r3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils flag-o-matic libtool toolchain-funcs + +DESCRIPTION="A spell checker replacement for ispell" +HOMEPAGE="http://aspell.net/" +SRC_URI="mirror://gnu/aspell/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="nls" + +PDEPEND="app-dicts/aspell-en" +LANGS="af be bg br ca cs cy da de de@1901 el en eo es et fi fo fr ga gl he hr +hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" +for lang in ${LANGS}; do + IUSE+=" l10n_${lang/@/-}" + # Need to keep linguas_* for now, since aspell uses gettext + IUSE+=" linguas_${lang/-/_}" + case ${lang} in + de@1901) dict="de-alt" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; + esac + PDEPEND+=" l10n_${lang/@/-}? ( app-dicts/aspell-${dict} )" +done +unset dict lang LANGS + +COMMON_DEPEND=" + >=sys-libs/ncurses-5.2:0= + nls? ( virtual/libintl ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +# English dictionary 0.5 is incompatible with aspell-0.6 +RDEPEND="${COMMON_DEPEND} + !=app-dicts/aspell-en-0.5* +" + +src_prepare() { + # fix for bug #467602 + if has_version ">=sys-devel/automake-1.13" ; then + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \ + "${S}"/configure.ac || die + fi + + epatch \ + "${FILESDIR}/${PN}-0.60.5-nls.patch" \ + "${FILESDIR}/${PN}-0.60.5-solaris.patch" \ + "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" \ + "${FILESDIR}/${PN}-0.60.6.1-clang.patch" + + rm m4/lt* m4/libtool.m4 + eautoreconf + elibtoolize --reverse-deps + + # Parallel install of libtool libraries doesn't always work. + # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html + # This has to be after automake has run so that we don't clobber + # the default target that automake creates for us. + echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die + +} + +src_configure() { + if has_version "sys-libs/ncurses[unicode]" ; then + CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)" + else + CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncurses)" + fi + + CURSES_LIB="${CURSES_LIB}" econf \ + $(use_enable nls) \ + --disable-static \ + --sysconfdir="${EPREFIX}"/etc/aspell \ + --enable-docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_install() { + default + + dodoc README* TODO + dohtml -r manual/aspell{,-dev}.html + docinto examples + dodoc "${S}"/examples/*.c + + # install ispell/aspell compatibility scripts + newbin scripts/ispell ispell-aspell + newbin scripts/spell spell-aspell + + prune_libtool_files --modules +} diff --git a/app-text/aspell/aspell-0.60.6.1-r4.ebuild b/app-text/aspell/aspell-0.60.6.1-r4.ebuild new file mode 100644 index 000000000000..fe7d97be8848 --- /dev/null +++ b/app-text/aspell/aspell-0.60.6.1-r4.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic libtool toolchain-funcs + +DESCRIPTION="A spell checker replacement for ispell" +HOMEPAGE="http://aspell.net/" +SRC_URI="mirror://gnu/aspell/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="nls unicode" + +PDEPEND="app-dicts/aspell-en" +LANGS="af be bg br ca cs cy da de de@1901 el en eo es et fi fo fr ga gl he hr +hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" +for lang in ${LANGS}; do + IUSE+=" l10n_${lang/@/-}" + # Need to keep linguas_* for now, since aspell uses gettext + IUSE+=" linguas_${lang/-/_}" + case ${lang} in + de@1901) dict="de-alt" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; + esac + PDEPEND+=" l10n_${lang/@/-}? ( app-dicts/aspell-${dict} )" +done +unset dict lang LANGS + +# English dictionary 0.5 is incompatible with aspell-0.6 +RDEPEND=" + sys-libs/ncurses:0=[unicode?] + nls? ( virtual/libintl ) + !=app-dicts/aspell-en-0.5* +" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +HTML_DOCS=( manual/aspell{,-dev}.html ) +PATCHES=( + "${FILESDIR}/${PN}-0.60.5-nls.patch" + "${FILESDIR}/${PN}-0.60.5-solaris.patch" + "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" + "${FILESDIR}/${PN}-0.60.6.1-clang.patch" + # includes fix for bug #467602 + "${FILESDIR}/${PN}-0.60.6.1-unicode.patch" +) + +src_prepare() { + default + + rm m4/lt* m4/libtool.m4 || die + eautoreconf + elibtoolize --reverse-deps + + # Parallel install of libtool libraries doesn't always work. + # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html + # This has to be after automake has run so that we don't clobber + # the default target that automake creates for us. + echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable unicode) \ + --disable-static \ + --sysconfdir="${EPREFIX}"/etc/aspell +} + +src_install() { + default + + docinto examples + dodoc "${S}"/examples/*.c + + # install ispell/aspell compatibility scripts + newbin scripts/ispell ispell-aspell + newbin scripts/spell spell-aspell + + # we explicitly pass '--disable-static' to econf, + # hence we can delete .la files unconditionally + find "${D}" -name '*.la' -delete || die +} diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild new file mode 100644 index 000000000000..574323a3d2db --- /dev/null +++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic libtool toolchain-funcs + +MY_P="${P/_/-}" + +DESCRIPTION="A spell checker replacement for ispell" +HOMEPAGE="http://aspell.net/" +if [[ "${PV}" = *_rc* ]] ; then + SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz" +else + SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz" +fi + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="nls unicode" + +PDEPEND="app-dicts/aspell-en" +LANGS="af be bg br ca cs cy da de de@1901 el en eo es et fi fo fr ga gl he hr +hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" +for lang in ${LANGS}; do + IUSE+=" l10n_${lang/@/-}" + # Need to keep linguas_* for now, since aspell uses gettext + IUSE+=" linguas_${lang/-/_}" + case ${lang} in + de@1901) dict="de-alt" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; + esac + PDEPEND+=" l10n_${lang/@/-}? ( app-dicts/aspell-${dict} )" +done +unset dict lang LANGS + +# English dictionary 0.5 is incompatible with aspell-0.6 +RDEPEND=" + sys-libs/ncurses:0=[unicode?] + nls? ( virtual/libintl ) + !=app-dicts/aspell-en-0.5* +" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/${MY_P}" + +HTML_DOCS=( manual/aspell{,-dev}.html ) +PATCHES=( + "${FILESDIR}/${PN}-0.60.5-nls.patch" + "${FILESDIR}/${PN}-0.60.5-solaris.patch" + "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" + "${FILESDIR}/${PN}-0.60.6.1-clang.patch" + # includes fix for bug #467602 + "${FILESDIR}/${PN}-0.60.6.1-unicode.patch" +) + +src_prepare() { + default + + rm m4/lt* m4/libtool.m4 || die + eautoreconf + elibtoolize --reverse-deps + + # Parallel install of libtool libraries doesn't always work. + # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html + # This has to be after automake has run so that we don't clobber + # the default target that automake creates for us. + echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die + + # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set + # any more. Fix this. + [[ ${CHOST} == *-darwin* ]] && use unicode && \ + append-cppflags -DNCURSES_WIDECHAR=1 +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable unicode) \ + --disable-static \ + --sysconfdir="${EPREFIX}"/etc/aspell +} + +src_install() { + default + + docinto examples + dodoc "${S}"/examples/*.c + + # install ispell/aspell compatibility scripts + newbin scripts/ispell ispell-aspell + newbin scripts/spell spell-aspell + + # we explicitly pass '--disable-static' to econf, + # hence we can delete .la files unconditionally + find "${D}" -name '*.la' -delete || die +} diff --git a/app-text/aspell/files/aspell-0.60.5-nls.patch b/app-text/aspell/files/aspell-0.60.5-nls.patch new file mode 100644 index 000000000000..3ea7c7c3f4ec --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.5-nls.patch @@ -0,0 +1,13 @@ +Index: aspell-0.60.5/Makefile.am +=================================================================== +--- aspell-0.60.5/Makefile.am ++++ aspell-0.60.5/Makefile.am +@@ -129,7 +129,7 @@ word_list_compress_SOURCES = prog/compre + + aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp + +-aspell_LDADD = libaspell.la $(CURSES_LIB) ++aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL) + + prezip_bin_SOURCES = prog/prezip.c + diff --git a/app-text/aspell/files/aspell-0.60.5-solaris.patch b/app-text/aspell/files/aspell-0.60.5-solaris.patch new file mode 100644 index 000000000000..1cfc5f3e6caa --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.5-solaris.patch @@ -0,0 +1,27 @@ +* grobian@gentoo.org: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be + defined when including wchar.h with g++ + +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -18,10 +18,6 @@ + + #include "settings.h" + +-#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +-# define _XOPEN_SOURCE_EXTENDED 1 +-#endif +- + #ifdef CURSES_NON_POSIX + #define CURSES_ONLY 1 + #endif +@@ -35,6 +31,10 @@ + + #include "gettext.h" + ++#ifdef DEFINE_XOPEN_SOURCE_EXTENDED ++# define _XOPEN_SOURCE_EXTENDED 1 ++#endif ++ + using namespace acommon; + + StackPtr state; diff --git a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch new file mode 100644 index 000000000000..84e05833d9d8 --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch @@ -0,0 +1,35 @@ +grobian@gentoo.org: +Darwin: fix for finding bundles (libtool modules, no equivalent in ELF) +This patch is not really upstreamable, bundles can have any name, but +Apple suggests using .bundle. libtool on Gentoo generates .bundle files +for modules on Darwin, so we need aspell to actually look for .bundle, +not .so. + +--- a/lib/new_filter.cpp ++++ b/lib/new_filter.cpp +@@ -458,11 +458,23 @@ + module->file.assign(option_file.str(), slash + 1 - option_file.str()); + //module->file += "lib"; + module->file += filter_name; +- module->file += "-filter.so"; ++ module->file += "-filter." ++#ifdef __APPLE_CC__ ++ "bundle" ++#else ++ "so" ++#endif ++ ; + } else { + if (module->file[0] != '/') + module->file.insert(0, option_file.str(), slash + 1 - option_file.str()); +- module->file += ".so"; ++ module->file += "." ++#ifdef __APPLE_CC__ ++ "bundle" ++#else ++ "so" ++#endif ++ ; + } + + return module.release(); diff --git a/app-text/aspell/files/aspell-0.60.6.1-clang.patch b/app-text/aspell/files/aspell-0.60.6.1-clang.patch new file mode 100644 index 000000000000..8d3e62dcdf0b --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.6.1-clang.patch @@ -0,0 +1,47 @@ +From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565 +--- a/interfaces/cc/aspell.h ++++ b/interfaces/cc/aspell.h +@@ -237,6 +237,7 @@ + /******************************** errors ********************************/ + + ++#ifndef ASPELL_ERRORS__HPP + extern const struct AspellErrorInfo * const aerror_other; + extern const struct AspellErrorInfo * const aerror_operation_not_supported; + extern const struct AspellErrorInfo * const aerror_cant_copy; +@@ -322,6 +323,7 @@ + extern const struct AspellErrorInfo * const aerror_bad_magic; + extern const struct AspellErrorInfo * const aerror_expression; + extern const struct AspellErrorInfo * const aerror_invalid_expression; ++#endif + + + /******************************* speller *******************************/ +--- a/prog/aspell.cpp ++++ b/prog/aspell.cpp +@@ -25,6 +25,7 @@ + # include + #endif + ++#include "errors.hpp" + #include "aspell.h" + + #ifdef USE_FILE_INO +@@ -40,7 +41,6 @@ + #include "convert.hpp" + #include "document_checker.hpp" + #include "enumeration.hpp" +-#include "errors.hpp" + #include "file_util.hpp" + #include "fstream.hpp" + #include "info.hpp" +--- a/prog/checker_string.hpp ++++ b/prog/checker_string.hpp +@@ -6,6 +6,7 @@ + + #include + ++#include "errors.hpp" + #include "aspell.h" + + #include "vector.hpp" diff --git a/app-text/aspell/files/aspell-0.60.6.1-unicode.patch b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch new file mode 100644 index 000000000000..8e1957c727a9 --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch @@ -0,0 +1,276 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + AC_CONFIG_SRCDIR(prog/aspell.cpp) + AC_CANONICAL_SYSTEM + AM_INIT_AUTOMAKE +-AM_CONFIG_HEADER(gen/settings.h) ++AC_CONFIG_HEADERS([gen/settings.h]) + + AM_MAINTAINER_MODE + +@@ -52,14 +52,11 @@ + AC_ARG_ENABLE(win32-relocatable, + [ --enable-win32-relocatable]) + +-AC_ARG_ENABLE(curses, +- AS_HELP_STRING([--enable-curses=LIBFILE],[cursor control library])) ++AC_ARG_ENABLE([curses], ++ AS_HELP_STRING([--enable-curses],[cursor control library])) + +-AC_ARG_ENABLE(curses-include, +- [ --enable-curses-include=DIR]) +- +-AC_ARG_ENABLE(wide-curses, +- AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control])) ++AC_ARG_ENABLE([unicode], ++ AS_HELP_STRING([--enable-unicode],[enable Unicode support])) + + AC_ARG_ENABLE(regex, + [ --disable-regex]) +@@ -312,197 +309,18 @@ + [AC_MSG_RESULT(no)] + ) + +-AC_SUBST(CURSES_LIB) +-AC_SUBST(CURSES_INCLUDE) +- +-if test "$enable_curses" != "no" +-then +- use_curses=t +- case "$enable_curses" in +- yes | "" ) ;; +- /* | *lib* | *.a | -l* | -L* ) CURSES_LIB="$enable_curses" ;; +- * ) CURSES_LIB=-l$enable_curses ;; +- esac +- case "$enable_curses_include" in +- yes | no | "") ;; +- -I* ) CURSES_INCLUDE="$enable_curses_include" ;; +- * ) CURSES_INCLUDE=-I$enable_curses_include ;; +- esac +-fi +- +-if test "$use_curses" +-then +- +- ORIG_LIBS="$LIBS" +- ORIG_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CURSES_INCLUDE $ORIG_CPPFLAGS" +- +- if test -z "$CURSES_LIB" +- then +- +- AC_MSG_CHECKING(for working curses library) +- +- if test "$enable_wide_curses" != "no" -a -n "$have_mblen" +- then +- LIBS="-lncursesw $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncursesw +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])]) +- fi +- +- if test -z "$CURSES_LIB" +- then +- LIBS="-lncurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- [ +- LIBS="-lncurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- [ +- LIBS="-lcurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lcurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- [ +- LIBS="-lncurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- ) ]) ]) ]) +- fi +- +- if test -n "$CURSES_LIB" +- then +- AC_MSG_RESULT([found in $CURSES_LIB]) +- else +- AC_MSG_RESULT([not found]) +- fi +- +- else +- +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file]) +- +- fi +- +- if test -n "$CURSES_LIB" +- then +- LIBS="$CURSES_LIB $ORIG_LIBS" +- +- if test "$enable_wide_curses" != "no" +- then +- +- AC_MSG_CHECKING(for wide character support in curses libraray) +- if test -n "$have_mblen" +- then +- AC_TRY_LINK( +- [#include +- #include CURSES_HEADER +- ], +- [wchar_t wch = 0; +- addnwstr(&wch, 1);], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_WIDE_CURSES, 1, [Defined if curses libraray includes wide character support])], +- [ +- +- AC_TRY_LINK( +- [#define _XOPEN_SOURCE_EXTENDED 1 +- #include +- #include CURSES_HEADER +- ], +- [wchar_t wch = 0; +- addnwstr(&wch, 1);], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_WIDE_CURSES, 1) +- AC_DEFINE(DEFINE_XOPEN_SOURCE_EXTENDED, 1, +- [Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. +- (Can't define globally as that will cause problems with some systems)]) +- ], +- [AC_MSG_RESULT(no) +- AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])])]) +- else +- AC_MSG_RESULT([no, because "mblen" is not supported]) +- AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.]) +- fi +- +- fi +- +- AC_MSG_CHECKING(if standard curses include sequence will work) +- AC_TRY_LINK( +- [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +- # define _XOPEN_SOURCE_EXTENDED 1 +- #endif +- #include +- #include +- #include CURSES_HEADER +- #include TERM_HEADER +- ], +- [tigetstr(const_cast("cup"));], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBCURSES, 1, +- [Defined if the curses library is available]) +- posix_termios=t +- AC_DEFINE(CURSES_INCLUDE_STANDARD, 1, +- [Defined if no special Workarounds are needed for Curses headers])], +- [AC_MSG_RESULT(no) +- +- dnl else if +- AC_MSG_CHECKING(if curses workaround I will work) +- AC_TRY_LINK( +- [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +- # define _XOPEN_SOURCE_EXTENDED 1 +- #endif +- #include +- #include +- #include CURSES_HEADER +- extern "C" {char * tigetstr(char * capname);}], +- [tigetstr(const_cast("cup"));], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBCURSES, 1, []) +- posix_termios=t +- AC_DEFINE(CURSES_INCLUDE_WORKAROUND_1, 1, +- [Defined if special Wordaround I is need for Curses headers])], +- [AC_MSG_RESULT(no) +- +- dnl else if +- AC_MSG_CHECKING(if curses without Unix stuff will work) +- AC_TRY_LINK( +- [#include CURSES_HEADER +- ], +- [initscr();], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBCURSES, 1, []) +- AC_DEFINE(CURSES_ONLY, 1, +- [Defined if curses like POSIX Functions should be used]) +- curses_only=t], +- [AC_MSG_RESULT(no) +- +- dnl else +- use_curses=false +- CURSES_LIBS="" +- CURSES_INCLUDE="" +- +- ]) ]) ]) +- +- fi +- +- CPPFLAGS="$ORIG_CPPFLAGS" +- LIBS="$ORIG_LIBS" +- +-fi ++AS_IF([test "x$enable_curses" != "xno"],[ ++ AS_IF([test "x$enable_unicode" != "xno"], ++ [AC_DEFINE([HAVE_WIDE_CURSES], [1], [Defined if curses library includes wide character support]) ++ ncurses_library="ncursesw"], ++ [ncurses_library="ncurses"]) ++ ++ PKG_CHECK_MODULES([NCURSES], ["$ncurses_library"]) ++ ++ AC_DEFINE([HAVE_LIBCURSES], [1], [Defined if the curses library is available]) ++ AC_DEFINE([CURSES_INCLUDE_STANDARD], [1], [Defined if no special Workarounds are needed for Curses headers]) ++ posix_termios=t ++]) + + if test -z "$posix_termios" -a -z "$curses_only" + then +--- a/Makefile.am ++++ b/Makefile.am +@@ -121,7 +121,7 @@ + # Aspell Program + # + +-AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" ++AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" $(NCURSES_CFLAGS) + + bin_PROGRAMS = word-list-compress aspell prezip-bin + +@@ -129,7 +129,7 @@ + + aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp + +-aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL) ++aspell_LDADD = libaspell.la $(NCURSES_LIBS) $(LTLIBINTL) + + prezip_bin_SOURCES = prog/prezip.c + +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -62,11 +62,11 @@ + + #if HAVE_LIBCURSES + +-#include CURSES_HEADER ++#include + + #if CURSES_INCLUDE_STANDARD + +-#include TERM_HEADER ++#include + + #elif CURSES_INCLUDE_WORKAROUND_1 + diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml new file mode 100644 index 000000000000..097975e3adc2 --- /dev/null +++ b/app-text/aspell/metadata.xml @@ -0,0 +1,4 @@ + + + + -- cgit v1.2.3