Update to 3.2.18: changes since 3.2.15 unknown.

4 files changed, 105 insertions, 62 deletions

diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index e8b6af7238e..fcc4ab683ad 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/10/14 21:51:19 jmmv Exp $
 #
 
-DISTNAME=	dasher-3.2.15
+DISTNAME=	dasher-3.2.18
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/3.2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,7 @@ COMMENT=	Easy typing without using keyboard
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	yes
 
diff --git a/editors/dasher/PLIST b/editors/dasher/PLIST
index 31894b12ca3..c217dd9176d 100644
--- a/editors/dasher/PLIST
+++ b/editors/dasher/PLIST
@@ -1,28 +1,27 @@
-@comment $NetBSD: PLIST,v 1.7 2005/02/26 17:25:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/10/14 21:51:19 jmmv Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
+share/dasher/alphabet.AfaanOromo.xml
 share/dasher/alphabet.Armenian.xml
 share/dasher/alphabet.Assamese.xml
 share/dasher/alphabet.Austen.xml
 share/dasher/alphabet.Azerbaijani.xml
 share/dasher/alphabet.Belarusian.xml
-share/dasher/alphabet.Bengali.xml
 share/dasher/alphabet.Bulgarian.xml
+share/dasher/alphabet.C.xml
 share/dasher/alphabet.Esperanto.xml
 share/dasher/alphabet.Estonian.xml
 share/dasher/alphabet.Filipino.xml
 share/dasher/alphabet.Greek.xml
 share/dasher/alphabet.Gujarati.xml
+share/dasher/alphabet.Hawaiian.xml
 share/dasher/alphabet.Hebrew.xml
 share/dasher/alphabet.Hindi.xml
 share/dasher/alphabet.Icelandic.xml
 share/dasher/alphabet.Igbo.xml
 share/dasher/alphabet.Indonesian.xml
 share/dasher/alphabet.IrishGaelic.xml
-share/dasher/alphabet.Japanese.xml
-share/dasher/alphabet.Joyo.xml
-share/dasher/alphabet.Joyo2.xml
 share/dasher/alphabet.Kannada.xml
 share/dasher/alphabet.Katakana.xml
 share/dasher/alphabet.Malay.xml
@@ -48,83 +47,108 @@ share/dasher/alphabet.Thai.xml
 share/dasher/alphabet.Tsonga.xml
 share/dasher/alphabet.Tswana.xml
 share/dasher/alphabet.Turkish.xml
+share/dasher/alphabet.Urdu.xml
 share/dasher/alphabet.Vietnamese.xml
 share/dasher/alphabet.Xhosa.xml
 share/dasher/alphabet.Yoruba.xml
 share/dasher/alphabet.Zulu.xml
+share/dasher/alphabet.abc.xml
+share/dasher/alphabet.adangbe.xml
 share/dasher/alphabet.afrikaans.xml
+share/dasher/alphabet.akan.xml
 share/dasher/alphabet.albanian.xml
+share/dasher/alphabet.amharic.xml
 share/dasher/alphabet.arabic.xml
+share/dasher/alphabet.basque.xml
 share/dasher/alphabet.bengali.xml
 share/dasher/alphabet.bopomofo.xml
+share/dasher/alphabet.bosnian.xml
+share/dasher/alphabet.breton.xml
 share/dasher/alphabet.catalan.xml
+share/dasher/alphabet.cherokee.xml
 share/dasher/alphabet.chinese.xml
 share/dasher/alphabet.chineseRuby.xml
+share/dasher/alphabet.corsican.xml
+share/dasher/alphabet.croatian.xml
 share/dasher/alphabet.czech.xml
 share/dasher/alphabet.danish.xml
+share/dasher/alphabet.danish2.xml
 share/dasher/alphabet.dtd
 share/dasher/alphabet.dutch.xml
 share/dasher/alphabet.english.xml
-share/dasher/alphabet.english2.xml
+share/dasher/alphabet.englishC.xml
+share/dasher/alphabet.ethiopic.xml
+share/dasher/alphabet.ewe.xml
+share/dasher/alphabet.faroese.xml
 share/dasher/alphabet.finnish.xml
+share/dasher/alphabet.finnish2.xml
 share/dasher/alphabet.french.xml
+share/dasher/alphabet.ga.xml
+share/dasher/alphabet.galician.xml
+share/dasher/alphabet.georgian.xml
 share/dasher/alphabet.german.xml
-share/dasher/alphabet.greek.xml
-share/dasher/alphabet.hebrew.xml
+share/dasher/alphabet.hausa.xml
 share/dasher/alphabet.hiragana.xml
+share/dasher/alphabet.hiragana2.xml
 share/dasher/alphabet.hungarian.xml
-share/dasher/alphabet.hungarianLowerCase.xml
 share/dasher/alphabet.ipa.xml
 share/dasher/alphabet.italian.xml
+share/dasher/alphabet.kazakh.xml
+share/dasher/alphabet.kirghiz.xml
+share/dasher/alphabet.kirundi.xml
 share/dasher/alphabet.klingon.xml
 share/dasher/alphabet.korean.xml
+share/dasher/alphabet.koreanNested.xml
+share/dasher/alphabet.kurdish.xml
+share/dasher/alphabet.lao.xml
+share/dasher/alphabet.latex.xml
+share/dasher/alphabet.latin.xml
+share/dasher/alphabet.latvian.xml
+share/dasher/alphabet.lithuanian.xml
+share/dasher/alphabet.luxembourgish.xml
+share/dasher/alphabet.macedonian.xml
+share/dasher/alphabet.maltese.xml
 share/dasher/alphabet.mongolian.xml
-share/dasher/alphabet.mongolian2.xml
+share/dasher/alphabet.myanmar.xml
+share/dasher/alphabet.nepali.xml
 share/dasher/alphabet.norwegian.xml
+share/dasher/alphabet.occitan.xml
+share/dasher/alphabet.ogham.xml
+share/dasher/alphabet.pashto.xml
+share/dasher/alphabet.perl.xml
 share/dasher/alphabet.persian.xml
 share/dasher/alphabet.pinyin.xml
 share/dasher/alphabet.polish.xml
 share/dasher/alphabet.portuguese.xml
+share/dasher/alphabet.romansch.xml
+share/dasher/alphabet.runic.xml
 share/dasher/alphabet.russian.xml
+share/dasher/alphabet.sanskrit.xml
+share/dasher/alphabet.serbian.xml
+share/dasher/alphabet.somali.xml
 share/dasher/alphabet.spanish.xml
 share/dasher/alphabet.swahili.xml
 share/dasher/alphabet.swedish.xml
 share/dasher/alphabet.thaana.xml
+share/dasher/alphabet.tigrinya.xml
+share/dasher/alphabet.turkmen.xml
+share/dasher/alphabet.ukrainian.xml
+share/dasher/alphabet.uzbek.xml
 share/dasher/alphabet.venda.xml
 share/dasher/alphabet.welsh.xml
 share/dasher/alphabet.xsl
+share/dasher/colour.blue.xml
 share/dasher/colour.dtd
-share/dasher/colour.hiragana.xml
+share/dasher/colour.euroasian.xml
+share/dasher/colour.euroasian2.xml
+share/dasher/colour.jamie.xml
+share/dasher/colour.rainbow.xml
+share/dasher/colour.vowels.xml
+share/dasher/colour.vowels2.xml
 share/dasher/colour.xml
 share/dasher/dasher.glade
-share/dasher/training_Afrikaans_ZA.txt
-share/dasher/training_Assamese_IN.txt
-share/dasher/training_English_ZA.txt
-share/dasher/training_Esperanto_XX.txt
-share/dasher/training_Gujarati_IN.txt
-share/dasher/training_Hindi_IN.txt
-share/dasher/training_Japanese_JP.txt
-share/dasher/training_Kannada_IN.txt
-share/dasher/training_Kashmiri_IN.txt
-share/dasher/training_Malayalam_IN.txt
-share/dasher/training_Marathi_IN.txt
-share/dasher/training_Ndebele_ZA.txt
-share/dasher/training_Oriya_IN.txt
-share/dasher/training_Punjabi_IN.txt
-share/dasher/training_Punjabi_IPA_IN.txt
-share/dasher/training_Sepedi_ZA.txt
-share/dasher/training_Sesotho_ZA.txt
-share/dasher/training_Sinhala_IN.txt
-share/dasher/training_Swati_ZA.txt
-share/dasher/training_Tamil_IN.txt
-share/dasher/training_Telugu_IN.txt
-share/dasher/training_Tsonga_ZA.txt
-share/dasher/training_Tswana_ZA.txt
-share/dasher/training_Urdu_PK.txt
-share/dasher/training_Venda_ZA.txt
-share/dasher/training_Xhosa_ZA.txt
-share/dasher/training_Zulu_ZA.txt
 share/dasher/training_albanian_SQ.txt
+share/dasher/training_basque_EU.txt
 share/dasher/training_bengali_BD.txt
 share/dasher/training_bengali_bn.txt
 share/dasher/training_czech_CS.txt
@@ -141,6 +165,7 @@ share/dasher/training_hiragana83_JP.txt
 share/dasher/training_hungarian_HU.txt
 share/dasher/training_italian_IT.txt
 share/dasher/training_mongolian_MN.txt
+share/dasher/training_persian_IR.txt
 share/dasher/training_polish_PL.txt
 share/dasher/training_portuguese_BR.txt
 share/dasher/training_russian_RU.txt
@@ -157,6 +182,15 @@ share/gnome/help/dasher/C/figures/prefs3.png
 share/gnome/help/dasher/C/figures/prefs4.png
 share/gnome/help/dasher/C/figures/prefs5.png
 share/gnome/help/dasher/C/version.xml
+share/gnome/help/dasher/eu/dasher.xml
+share/gnome/help/dasher/eu/figures/figure2.png
+share/gnome/help/dasher/eu/figures/main.png
+share/gnome/help/dasher/eu/figures/prefs1.png
+share/gnome/help/dasher/eu/figures/prefs2.png
+share/gnome/help/dasher/eu/figures/prefs3.png
+share/gnome/help/dasher/eu/figures/prefs4.png
+share/gnome/help/dasher/eu/figures/prefs5.png
+share/gnome/help/dasher/eu/version.xml
 share/icons/dasher.png
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dasher.mo
@@ -174,9 +208,12 @@ ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/dasher.mo
@@ -200,6 +237,7 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/dasher.mo
@@ -208,13 +246,17 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/dasher.mo
+${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/dasher.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/dasher.mo
 share/omf/dasher/dasher-C.omf
+share/omf/dasher/dasher-eu.omf
 @dirrm share/omf/dasher
 @comment in scrollkeeper: @dirrm share/omf
 @comment in xdg-dirs: @dirrm share/icons
+@dirrm share/gnome/help/dasher/eu/figures
+@dirrm share/gnome/help/dasher/eu
 @dirrm share/gnome/help/dasher/C/figures
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
diff --git a/editors/dasher/distinfo b/editors/dasher/distinfo
index 38355930850..646b6afe451 100644
--- a/editors/dasher/distinfo
+++ b/editors/dasher/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/10/10 16:31:59 joerg Exp $
+$NetBSD: distinfo,v 1.10 2005/10/14 21:51:19 jmmv Exp $
 
-SHA1 (dasher-3.2.15.tar.bz2) = 43d61f69ccc275ee4f9af977bdb2aa2de8591bbd
-RMD160 (dasher-3.2.15.tar.bz2) = c940bc7add699f1c93073453f2bf9ea361aad895
-Size (dasher-3.2.15.tar.bz2) = 8981223 bytes
-SHA1 (patch-aa) = 782e9a16b5e5807a98b64c75a31bed82eb96f8b8
+SHA1 (dasher-3.2.18.tar.bz2) = bfa23eac087197d4ff231bbe59a4ed7d4e39f839
+RMD160 (dasher-3.2.18.tar.bz2) = 49a7ed5c5123d33ea042ee112f885e1582bd4132
+Size (dasher-3.2.18.tar.bz2) = 4758337 bytes
+SHA1 (patch-aa) = af87128e30cff75d12e491a0ee0b49cefddc0674
diff --git a/editors/dasher/patches/patch-aa b/editors/dasher/patches/patch-aa
index 49691cf5356..5ade1825e43 100644
--- a/editors/dasher/patches/patch-aa
+++ b/editors/dasher/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1 2005/10/10 16:32:00 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/14 21:51:19 jmmv Exp $
 
---- configure.orig	2005-07-10 15:59:17.000000000 +0000
+--- configure.orig	2005-09-05 14:06:07.000000000 +0200
 +++ configure
-@@ -3851,13 +3851,13 @@ darwin* | rhapsody*)
+@@ -3953,13 +3953,13 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
 -freebsd* | kfreebsd*-gnu)
 +freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
        # Not sure whether the presence of OpenBSD here was a mistake.
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.1 2005/10/10 16:32:00 joerg Exp $
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -6767,7 +6767,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7620,7 +7620,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.1 2005/10/10 16:32:00 joerg Exp $
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -7511,7 +7511,7 @@ kfreebsd*-gnu)
+@@ -8198,7 +8198,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -36,16 +36,16 @@ $NetBSD: patch-aa,v 1.1 2005/10/10 16:32:00 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -12511,7 +12511,7 @@ if test -z "$aix_libpath"; then aix_libp
-     freebsd-elf*)
-       archive_cmds_need_lc_CXX=no
-       ;;
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-       # conventions
-       ld_shlibs_CXX=yes
-@@ -13271,7 +13271,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -10581,7 +10581,7 @@ if test -z "$aix_libpath"; then aix_libp
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -11288,7 +11288,7 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.1 2005/10/10 16:32:00 joerg Exp $
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13992,7 +13992,7 @@ kfreebsd*-gnu)
+@@ -11902,7 +11902,7 @@ kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;