[oe-commits] org.oe.dev aspell-native_0.60.5.bb, aspell6-en_6.0-0.bb, aspell_0.60.5.bb : some

[xora commit]

aspell-native_0.60.5.bb, aspell6-en_6.0-0.bb, aspell_0.60.5.bb : some
speeling cheecker (spelling checker) updates. Moved to latest version
of aspell and dictionaries.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 1415a4bbb58b3c5541f88dcfddf667471d14c891
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1415a4bbb58b3c5541f88dcfddf667471d14c891
Files:
1
packages/aspell/aspell-native_0.60.5.bb
packages/aspell/aspell6-en_6.0-0.bb
packages/aspell/aspell_0.60.5.bb
packages/aspell/aspell-lang.inc
Diffs:

#
# mt diff -r9825e252e64e709a5ee477d7bd717c6c8fe00957 -r1415a4bbb58b3c5541f88dcfddf667471d14c891
#
# 
# 
# add_file "packages/aspell/aspell-native_0.60.5.bb"
#  content [780d3e1c66b3026e170f89b30ecd581820d86957]
# 
# add_file "packages/aspell/aspell6-en_6.0-0.bb"
#  content [6687b16aa9a86ea072039ce439bebd3e11a05f39]
# 
# add_file "packages/aspell/aspell_0.60.5.bb"
#  content [1154c241600ac09cb8d9f328d3b08c2265babd5c]
# 
# patch "packages/aspell/aspell-lang.inc"
#  from [d843973f116fe12e59595241ec1501697ed7e0cb]
#    to [3cd5f7765678c8fe2dd208d9ded7033c037b3cf4]
# 
============================================================
--- packages/aspell/aspell-native_0.60.5.bb	780d3e1c66b3026e170f89b30ecd581820d86957
+++ packages/aspell/aspell-native_0.60.5.bb	780d3e1c66b3026e170f89b30ecd581820d86957
@@ -0,0 +1,6 @@
+require aspell_${PV}.bb
+
+inherit native
+
+S = "${WORKDIR}/aspell-${PV}"
+
============================================================
--- packages/aspell/aspell6-en_6.0-0.bb	6687b16aa9a86ea072039ce439bebd3e11a05f39
+++ packages/aspell/aspell6-en_6.0-0.bb	6687b16aa9a86ea072039ce439bebd3e11a05f39
@@ -0,0 +1,14 @@
+LICENSE = "Copyright file"
+SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-${PV}.tar.bz2"
+PR="r1"
+
+require aspell-lang.inc
+
+FILES_${PN} += "${docdir}/Copyright"
+FILES_${PN}-doc = ""
+
+do_install_append() {
+	install -d ${D}${docdir}
+	install ${S}/Copyright ${D}${docdir}
+}
+
============================================================
--- packages/aspell/aspell_0.60.5.bb	1154c241600ac09cb8d9f328d3b08c2265babd5c
+++ packages/aspell/aspell_0.60.5.bb	1154c241600ac09cb8d9f328d3b08c2265babd5c
@@ -0,0 +1,18 @@
+SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/aspell-${PV}.tar.gz"
+DESCRIPTION = "GNU Aspell spell-checker"
+SECTION = "console/utils"
+LICENSE="LGPL"
+
+PACKAGES =+ "libaspell libpspell libpspell-dev aspell-utils"
+
+FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*"
+FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*"
+FILES_${PN} = "${bindir}/aspell"
+FILES_libpspell = "${libdir}/libpspell.so.*"
+FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/aspell/aspell-lang.inc	d843973f116fe12e59595241ec1501697ed7e0cb
+++ packages/aspell/aspell-lang.inc	3cd5f7765678c8fe2dd208d9ded7033c037b3cf4
@@ -1,23 +1,20 @@
-FILES_${PN} = "/usr/lib/aspell/* /usr/share/aspell/*"
+FILES_${PN} = "/usr/lib/aspell* /usr/share/aspell*"
 
 DEPENDS = "aspell-native"
 
 do_configure() {
 	cd ${S}
-	export dictdir=/usr/lib/aspell/
-	export datadir=/usr/share/aspell/
-	DESTDIR=${D} ./configure
+	DESTDIR=${D} ./configure --vars ASPELL=${STAGING_BINDIR_NATIVE}/aspell
 }
 
 do_compile() {
-        export dictdir=/usr/lib/aspell/
-	export datadir=/usr/share/aspell/
-	dictdir=/usr/lib/aspell oe_runmake
+	sed -i -e "s|dictdir.*lib|dictdir = ${libdir}|" Makefile
+	sed -i -e "s|datadir.*lib|datadir = ${libdir}|" Makefile
+	oe_runmake
 }
 
 do_install() {
-        export dictdir=/usr/lib/aspell/
-        export datadir=/usr/share/aspell/
+	unset datadir
 	oe_runmake install
 }