Update to 4.6.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9669 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 200 insertions, 195 deletions

diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 4efcdbcbf..a7c46462d 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,12 +3,11 @@
 # Whom:					lewiz <purple@lewiz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/dasher/Makefile,v 1.56 2007/07/11 04:39:20 marcus Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.57 2007/08/04 03:51:27 marcus Exp $
 #
 
 PORTNAME=	dasher
-PORTVERSION=	4.5.2
-PORTREVISION=	1
+PORTVERSION=	4.6.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 7ded2c9c4..b41c7580e 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.5.2.tar.bz2) = 59317850c12064ced3eb76c753be7c71
-SHA256 (gnome2/dasher-4.5.2.tar.bz2) = b57c884eea81be1ff721a546d40f406d375608eb41e31220b31bfff59e6b15ce
-SIZE (gnome2/dasher-4.5.2.tar.bz2) = 6566828
+MD5 (gnome2/dasher-4.6.0.tar.bz2) = ab9fce024bb2b1ea3cb479e82819d57d
+SHA256 (gnome2/dasher-4.6.0.tar.bz2) = 5c1b5ba9011ce2e31118cd25138dc4c4e8269a51d61c38788f797555cc6b5089
+SIZE (gnome2/dasher-4.6.0.tar.bz2) = 6476900
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 615025c4b..813bba1be 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -1,188 +1,188 @@
 bin/dasher
 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.Bulgarian.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.Kannada.xml
-share/dasher/alphabet.Katakana.xml
-share/dasher/alphabet.Malay.xml
-share/dasher/alphabet.Malayalam.xml
-share/dasher/alphabet.Marathi.xml
-share/dasher/alphabet.Moldavian.xml
-share/dasher/alphabet.Ndebele.xml
-share/dasher/alphabet.Oriya.xml
-share/dasher/alphabet.Punjabi.xml
-share/dasher/alphabet.Romanian.xml
-share/dasher/alphabet.Sami.xml
-share/dasher/alphabet.ScotsGaelic.xml
-share/dasher/alphabet.Sepedi.xml
-share/dasher/alphabet.Sesotho.xml
-share/dasher/alphabet.Sinhala.xml
-share/dasher/alphabet.Slovak.xml
-share/dasher/alphabet.Slovenian.xml
-share/dasher/alphabet.Swati.xml
-share/dasher/alphabet.Tajik.xml
-share/dasher/alphabet.Tamil.xml
-share/dasher/alphabet.Telugu.xml
-share/dasher/alphabet.Thai.xml
-share/dasher/alphabet.Thai2.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.dtd
-share/dasher/alphabet.dutch.xml
-share/dasher/alphabet.english.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.hausa.xml
-share/dasher/alphabet.hiragana.xml
-share/dasher/alphabet.hiragana2.xml
-share/dasher/alphabet.hungarian.xml
-share/dasher/alphabet.ipa.xml
-share/dasher/alphabet.italian.xml
-share/dasher/alphabet.japanese.canna.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.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.pinyin2.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.euroasian.xml
-share/dasher/colour.euroasian2.xml
-share/dasher/colour.euroasian3.xml
-share/dasher/colour.jamie.xml
-share/dasher/colour.rainbow.xml
-share/dasher/colour.thai.xml
-share/dasher/colour.vowels.xml
-share/dasher/colour.vowels2.xml
-share/dasher/colour.xml
-share/dasher/controllabels.dtd
-share/dasher/controllabels.xml
-share/dasher/dasher.compose.glade
-share/dasher/dasher.direct.glade
-share/dasher/dasher.fullscreen.glade
-share/dasher/dasher.traditional.glade
-share/dasher/dashermaemo.glade
-share/dasher/dashermaemofullscreen.glade
-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_canna_JP.txt
-share/dasher/training_czech_CS.txt
-share/dasher/training_danish_DK.txt
-share/dasher/training_dutch_NL.txt
-share/dasher/training_english_GB.txt
-share/dasher/training_finnish_FI.txt
-share/dasher/training_french_FR.txt
-share/dasher/training_german_DE.txt
-share/dasher/training_greek_GR.txt
-share/dasher/training_hebrew_IL.txt
-share/dasher/training_hiragana60_JP.txt
-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
-share/dasher/training_spanish_ES.txt
-share/dasher/training_swahili_KE.txt
-share/dasher/training_swedish_SE.txt
-share/dasher/training_turkish_TR.txt
-share/dasher/training_welsh_GB.txt
+%%DATADIR%%/alphabet.AfaanOromo.xml
+%%DATADIR%%/alphabet.Armenian.xml
+%%DATADIR%%/alphabet.Assamese.xml
+%%DATADIR%%/alphabet.Austen.xml
+%%DATADIR%%/alphabet.Azerbaijani.xml
+%%DATADIR%%/alphabet.Belarusian.xml
+%%DATADIR%%/alphabet.Bulgarian.xml
+%%DATADIR%%/alphabet.Esperanto.xml
+%%DATADIR%%/alphabet.Estonian.xml
+%%DATADIR%%/alphabet.Filipino.xml
+%%DATADIR%%/alphabet.Greek.xml
+%%DATADIR%%/alphabet.Gujarati.xml
+%%DATADIR%%/alphabet.Hawaiian.xml
+%%DATADIR%%/alphabet.Hebrew.xml
+%%DATADIR%%/alphabet.Hindi.xml
+%%DATADIR%%/alphabet.Icelandic.xml
+%%DATADIR%%/alphabet.Igbo.xml
+%%DATADIR%%/alphabet.Indonesian.xml
+%%DATADIR%%/alphabet.IrishGaelic.xml
+%%DATADIR%%/alphabet.Kannada.xml
+%%DATADIR%%/alphabet.Katakana.xml
+%%DATADIR%%/alphabet.Malay.xml
+%%DATADIR%%/alphabet.Malayalam.xml
+%%DATADIR%%/alphabet.Marathi.xml
+%%DATADIR%%/alphabet.Moldavian.xml
+%%DATADIR%%/alphabet.Ndebele.xml
+%%DATADIR%%/alphabet.Oriya.xml
+%%DATADIR%%/alphabet.Punjabi.xml
+%%DATADIR%%/alphabet.Romanian.xml
+%%DATADIR%%/alphabet.Sami.xml
+%%DATADIR%%/alphabet.ScotsGaelic.xml
+%%DATADIR%%/alphabet.Sepedi.xml
+%%DATADIR%%/alphabet.Sesotho.xml
+%%DATADIR%%/alphabet.Sinhala.xml
+%%DATADIR%%/alphabet.Slovak.xml
+%%DATADIR%%/alphabet.Slovenian.xml
+%%DATADIR%%/alphabet.Swati.xml
+%%DATADIR%%/alphabet.Tajik.xml
+%%DATADIR%%/alphabet.Tamil.xml
+%%DATADIR%%/alphabet.Telugu.xml
+%%DATADIR%%/alphabet.Thai.xml
+%%DATADIR%%/alphabet.Thai2.xml
+%%DATADIR%%/alphabet.Tsonga.xml
+%%DATADIR%%/alphabet.Tswana.xml
+%%DATADIR%%/alphabet.Turkish.xml
+%%DATADIR%%/alphabet.Urdu.xml
+%%DATADIR%%/alphabet.Vietnamese.xml
+%%DATADIR%%/alphabet.Xhosa.xml
+%%DATADIR%%/alphabet.Yoruba.xml
+%%DATADIR%%/alphabet.Zulu.xml
+%%DATADIR%%/alphabet.abc.xml
+%%DATADIR%%/alphabet.adangbe.xml
+%%DATADIR%%/alphabet.afrikaans.xml
+%%DATADIR%%/alphabet.akan.xml
+%%DATADIR%%/alphabet.albanian.xml
+%%DATADIR%%/alphabet.amharic.xml
+%%DATADIR%%/alphabet.arabic.xml
+%%DATADIR%%/alphabet.basque.xml
+%%DATADIR%%/alphabet.bengali.xml
+%%DATADIR%%/alphabet.bopomofo.xml
+%%DATADIR%%/alphabet.bosnian.xml
+%%DATADIR%%/alphabet.breton.xml
+%%DATADIR%%/alphabet.catalan.xml
+%%DATADIR%%/alphabet.cherokee.xml
+%%DATADIR%%/alphabet.chinese.xml
+%%DATADIR%%/alphabet.chineseRuby.xml
+%%DATADIR%%/alphabet.corsican.xml
+%%DATADIR%%/alphabet.croatian.xml
+%%DATADIR%%/alphabet.czech.xml
+%%DATADIR%%/alphabet.danish.xml
+%%DATADIR%%/alphabet.dtd
+%%DATADIR%%/alphabet.dutch.xml
+%%DATADIR%%/alphabet.english.xml
+%%DATADIR%%/alphabet.englishC.xml
+%%DATADIR%%/alphabet.ethiopic.xml
+%%DATADIR%%/alphabet.ewe.xml
+%%DATADIR%%/alphabet.faroese.xml
+%%DATADIR%%/alphabet.finnish.xml
+%%DATADIR%%/alphabet.finnish2.xml
+%%DATADIR%%/alphabet.french.xml
+%%DATADIR%%/alphabet.ga.xml
+%%DATADIR%%/alphabet.galician.xml
+%%DATADIR%%/alphabet.georgian.xml
+%%DATADIR%%/alphabet.german.xml
+%%DATADIR%%/alphabet.hausa.xml
+%%DATADIR%%/alphabet.hiragana.xml
+%%DATADIR%%/alphabet.hiragana2.xml
+%%DATADIR%%/alphabet.hungarian.xml
+%%DATADIR%%/alphabet.ipa.xml
+%%DATADIR%%/alphabet.italian.xml
+%%DATADIR%%/alphabet.japanese.canna.xml
+%%DATADIR%%/alphabet.kazakh.xml
+%%DATADIR%%/alphabet.kirghiz.xml
+%%DATADIR%%/alphabet.kirundi.xml
+%%DATADIR%%/alphabet.klingon.xml
+%%DATADIR%%/alphabet.korean.xml
+%%DATADIR%%/alphabet.koreanNested.xml
+%%DATADIR%%/alphabet.kurdish.xml
+%%DATADIR%%/alphabet.lao.xml
+%%DATADIR%%/alphabet.latex.xml
+%%DATADIR%%/alphabet.latin.xml
+%%DATADIR%%/alphabet.latvian.xml
+%%DATADIR%%/alphabet.lithuanian.xml
+%%DATADIR%%/alphabet.luxembourgish.xml
+%%DATADIR%%/alphabet.macedonian.xml
+%%DATADIR%%/alphabet.maltese.xml
+%%DATADIR%%/alphabet.mongolian.xml
+%%DATADIR%%/alphabet.myanmar.xml
+%%DATADIR%%/alphabet.nepali.xml
+%%DATADIR%%/alphabet.norwegian.xml
+%%DATADIR%%/alphabet.occitan.xml
+%%DATADIR%%/alphabet.ogham.xml
+%%DATADIR%%/alphabet.pashto.xml
+%%DATADIR%%/alphabet.perl.xml
+%%DATADIR%%/alphabet.persian.xml
+%%DATADIR%%/alphabet.pinyin.xml
+%%DATADIR%%/alphabet.pinyin2.xml
+%%DATADIR%%/alphabet.polish.xml
+%%DATADIR%%/alphabet.portuguese.xml
+%%DATADIR%%/alphabet.romansch.xml
+%%DATADIR%%/alphabet.runic.xml
+%%DATADIR%%/alphabet.russian.xml
+%%DATADIR%%/alphabet.sanskrit.xml
+%%DATADIR%%/alphabet.serbian.xml
+%%DATADIR%%/alphabet.somali.xml
+%%DATADIR%%/alphabet.spanish.xml
+%%DATADIR%%/alphabet.swahili.xml
+%%DATADIR%%/alphabet.swedish.xml
+%%DATADIR%%/alphabet.thaana.xml
+%%DATADIR%%/alphabet.tigrinya.xml
+%%DATADIR%%/alphabet.turkmen.xml
+%%DATADIR%%/alphabet.ukrainian.xml
+%%DATADIR%%/alphabet.uzbek.xml
+%%DATADIR%%/alphabet.venda.xml
+%%DATADIR%%/alphabet.welsh.xml
+%%DATADIR%%/alphabet.xsl
+%%DATADIR%%/colour.blue.xml
+%%DATADIR%%/colour.dtd
+%%DATADIR%%/colour.euroasian.xml
+%%DATADIR%%/colour.euroasian2.xml
+%%DATADIR%%/colour.euroasian3.xml
+%%DATADIR%%/colour.jamie.xml
+%%DATADIR%%/colour.rainbow.xml
+%%DATADIR%%/colour.thai.xml
+%%DATADIR%%/colour.vowels.xml
+%%DATADIR%%/colour.vowels2.xml
+%%DATADIR%%/colour.xml
+%%DATADIR%%/controllabels.dtd
+%%DATADIR%%/controllabels.xml
+%%DATADIR%%/dasher.compose.glade
+%%DATADIR%%/dasher.direct.glade
+%%DATADIR%%/dasher.fullscreen.glade
+%%DATADIR%%/dasher.traditional.glade
+%%DATADIR%%/dashermaemo.glade
+%%DATADIR%%/dashermaemofullscreen.glade
+%%DATADIR%%/training_albanian_SQ.txt
+%%DATADIR%%/training_basque_EU.txt
+%%DATADIR%%/training_bengali_BD.txt
+%%DATADIR%%/training_bengali_bn.txt
+%%DATADIR%%/training_canna_JP.txt
+%%DATADIR%%/training_czech_CS.txt
+%%DATADIR%%/training_danish_DK.txt
+%%DATADIR%%/training_dutch_NL.txt
+%%DATADIR%%/training_english_GB.txt
+%%DATADIR%%/training_finnish_FI.txt
+%%DATADIR%%/training_french_FR.txt
+%%DATADIR%%/training_german_DE.txt
+%%DATADIR%%/training_greek_GR.txt
+%%DATADIR%%/training_hebrew_IL.txt
+%%DATADIR%%/training_hiragana60_JP.txt
+%%DATADIR%%/training_hiragana83_JP.txt
+%%DATADIR%%/training_hungarian_HU.txt
+%%DATADIR%%/training_italian_IT.txt
+%%DATADIR%%/training_mongolian_MN.txt
+%%DATADIR%%/training_persian_IR.txt
+%%DATADIR%%/training_polish_PL.txt
+%%DATADIR%%/training_portuguese_BR.txt
+%%DATADIR%%/training_russian_RU.txt
+%%DATADIR%%/training_spanish_ES.txt
+%%DATADIR%%/training_swahili_KE.txt
+%%DATADIR%%/training_swedish_SE.txt
+%%DATADIR%%/training_turkish_TR.txt
+%%DATADIR%%/training_welsh_GB.txt
 share/gnome/help/dasher/C/dasher.xml
 share/gnome/help/dasher/C/figures/a-z.gif
 share/gnome/help/dasher/C/figures/aa-az.gif
@@ -263,11 +263,6 @@ share/gnome/help/dasher/sv/figures/prefs2.png
 share/gnome/help/dasher/sv/figures/prefs3.png
 share/gnome/help/dasher/sv/figures/prefs4.png
 share/gnome/help/dasher/sv/figures/prefs5.png
-share/omf/dasher/dasher-C.omf
-share/omf/dasher/dasher-es.omf
-share/omf/dasher/dasher-fr.omf
-share/omf/dasher/dasher-ru.omf
-share/omf/dasher/dasher-sv.omf
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
@@ -327,6 +322,7 @@ share/locale/pt_BR/LC_MESSAGES/dasher.mo
 share/locale/ro/LC_MESSAGES/dasher.mo
 share/locale/ru/LC_MESSAGES/dasher.mo
 share/locale/rw/LC_MESSAGES/dasher.mo
+share/locale/si/LC_MESSAGES/dasher.mo
 share/locale/sk/LC_MESSAGES/dasher.mo
 share/locale/sl/LC_MESSAGES/dasher.mo
 share/locale/sq/LC_MESSAGES/dasher.mo
@@ -339,10 +335,16 @@ share/locale/tk/LC_MESSAGES/dasher.mo
 share/locale/tr/LC_MESSAGES/dasher.mo
 share/locale/ug/LC_MESSAGES/dasher.mo
 share/locale/uk/LC_MESSAGES/dasher.mo
+share/locale/uz@cyrillic/LC_MESSAGES/dasher.mo
 share/locale/vi/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
+share/omf/dasher/dasher-C.omf
+share/omf/dasher/dasher-es.omf
+share/omf/dasher/dasher-fr.omf
+share/omf/dasher/dasher-ru.omf
+share/omf/dasher/dasher-sv.omf
 @dirrm share/omf/dasher
 @dirrm share/gnome/help/dasher/sv/figures
 @dirrm share/gnome/help/dasher/sv
@@ -355,11 +357,15 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 @dirrm share/gnome/help/dasher/C/figures
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
-@dirrm share/dasher
+@dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES