13 files changed, 146 insertions, 70 deletions

diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index f3ee2481e754..4c4ec4d0e1dd 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:   atk
-# Date Created:			14 May 2001
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
+# New ports collection makefile for:	atk
+# Date Created:				14 May 2001
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.8.0
+PORTVERSION=	1.9.1
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
-		ftp://ftp.gtk.org/pub/gtk/v2.4/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.8
+		ftp://ftp.gtk.org/pub/gtk/v2.6/
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index ac7f3c0887bc..c6fba736eec7 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/atk-1.8.0.tar.bz2) = fc46940febb0e91427b77457e6356f3d
-SIZE (gnome2/atk-1.8.0.tar.bz2) = 500156
+MD5 (gnome2/atk-1.9.1.tar.bz2) = 689eb6a77215858eb804f6dcc90058be
+SIZE (gnome2/atk-1.9.1.tar.bz2) = 483363
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 5e0de79d6386..6711eb473ba6 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -26,41 +26,12 @@ include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk-1.0.a
 lib/libatk-1.0.so
-lib/libatk-1.0.so.800
+lib/libatk-1.0.so.901
 libdata/pkgconfig/atk.pc
-%%DOCSDIR%%/AtkAction.html
-%%DOCSDIR%%/AtkComponent.html
-%%DOCSDIR%%/AtkDocument.html
-%%DOCSDIR%%/AtkEditableText.html
-%%DOCSDIR%%/AtkGObjectAccessible.html
-%%DOCSDIR%%/AtkHyperlink.html
-%%DOCSDIR%%/AtkHypertext.html
-%%DOCSDIR%%/AtkImage.html
-%%DOCSDIR%%/AtkNoOpObject.html
-%%DOCSDIR%%/AtkNoOpObjectFactory.html
-%%DOCSDIR%%/AtkObject.html
-%%DOCSDIR%%/AtkObjectFactory.html
-%%DOCSDIR%%/AtkRegistry.html
-%%DOCSDIR%%/AtkRelation.html
-%%DOCSDIR%%/AtkRelationSet.html
-%%DOCSDIR%%/AtkSelection.html
-%%DOCSDIR%%/AtkStateSet.html
-%%DOCSDIR%%/AtkStreamableContent.html
-%%DOCSDIR%%/AtkTable.html
-%%DOCSDIR%%/AtkText.html
-%%DOCSDIR%%/AtkUtil.html
-%%DOCSDIR%%/AtkValue.html
-%%DOCSDIR%%/atk-AtkState.html
-%%DOCSDIR%%/atk.devhelp
-%%DOCSDIR%%/atk.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/up.png
 share/locale/af/LC_MESSAGES/atk10.mo
 share/locale/am/LC_MESSAGES/atk10.mo
+share/locale/ar/LC_MESSAGES/atk10.mo
+share/locale/as/LC_MESSAGES/atk10.mo
 share/locale/az/LC_MESSAGES/atk10.mo
 share/locale/be/LC_MESSAGES/atk10.mo
 share/locale/bg/LC_MESSAGES/atk10.mo
@@ -120,14 +91,18 @@ share/locale/sr@Latn/LC_MESSAGES/atk10.mo
 share/locale/sr@ije/LC_MESSAGES/atk10.mo
 share/locale/sv/LC_MESSAGES/atk10.mo
 share/locale/ta/LC_MESSAGES/atk10.mo
+share/locale/th/LC_MESSAGES/atk10.mo
 share/locale/tk/LC_MESSAGES/atk10.mo
 share/locale/tr/LC_MESSAGES/atk10.mo
 share/locale/uk/LC_MESSAGES/atk10.mo
 share/locale/vi/LC_MESSAGES/atk10.mo
 share/locale/wa/LC_MESSAGES/atk10.mo
+share/locale/xh/LC_MESSAGES/atk10.mo
 share/locale/yi/LC_MESSAGES/atk10.mo
 share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
+@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/as 2> /dev/null || true
 @unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/li 2> /dev/null || true
 @unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index c93d7ee10dfe..8ada000f1a79 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dasher
-PORTVERSION=	3.2.11
-PORTREVISION=	4
+PORTVERSION=	3.2.15
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/3.2
@@ -22,9 +21,11 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
+		libwnck
 WANT_GNOME=	yes
 USE_LIBTOOL_VER=15
+INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index 9c279f0959c9..02812ef26e43 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/dasher-3.2.11.tar.bz2) = f3180d8ec786c1ea158cc5ac0894856c
-SIZE (gnome2/dasher-3.2.11.tar.bz2) = 2651970
+MD5 (gnome2/dasher-3.2.15.tar.bz2) = a3fa85e32c94c69476e12ecba7d257e7
+SIZE (gnome2/dasher-3.2.15.tar.bz2) = 8981223
diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
index 93031e47f2c4..05d3c3b835fd 100644
--- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
+++ b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
@@ -1,20 +1,11 @@
---- Src/Gtk2/speech.cc.orig	Fri Jul 30 15:28:41 2004
-+++ Src/Gtk2/speech.cc	Sun Feb 13 20:15:46 2005
-@@ -46,7 +46,7 @@
- 
-   voices = GNOME_Speech_SynthesisDriver_getAllVoices (rv, &ev);
- 
--  if (voices==NULL || BONOBO_EX (&ev)) {
-+  if (voices==NULL || BONOBO_EX (&ev) || voices->_length==0) {
-     printf(_("Unable to initialize voices"));
-     speaker=NULL;
-     return;
+--- Src/Gtk2/speech.cc.orig	Fri Sep 17 06:53:53 2004
++++ Src/Gtk2/speech.cc	Sat Feb 26 01:00:12 2005
 @@ -78,7 +78,8 @@
  void teardown_speech() {
  
    bonobo_object_release_unref (speaker, NULL);
 -  CORBA_free (voices);
-+  if (voices != NULL && voices->_length != 0)
++  if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0)
 +    CORBA_free (voices);
    CORBA_exception_free (&ev);
  
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 2d6c939517fc..1be84180bf55 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -1,6 +1,8 @@
 bin/dasher
 share/gnome/applications/dasher.desktop
 share/gnome/dasher/alphabet.Armenian.xml
+share/gnome/dasher/alphabet.Assamese.xml
+share/gnome/dasher/alphabet.Austen.xml
 share/gnome/dasher/alphabet.Azerbaijani.xml
 share/gnome/dasher/alphabet.Belarusian.xml
 share/gnome/dasher/alphabet.Bengali.xml
@@ -9,23 +11,37 @@ share/gnome/dasher/alphabet.Esperanto.xml
 share/gnome/dasher/alphabet.Estonian.xml
 share/gnome/dasher/alphabet.Filipino.xml
 share/gnome/dasher/alphabet.Greek.xml
+share/gnome/dasher/alphabet.Gujarati.xml
 share/gnome/dasher/alphabet.Hebrew.xml
+share/gnome/dasher/alphabet.Hindi.xml
 share/gnome/dasher/alphabet.Icelandic.xml
 share/gnome/dasher/alphabet.Igbo.xml
 share/gnome/dasher/alphabet.Indonesian.xml
 share/gnome/dasher/alphabet.IrishGaelic.xml
+share/gnome/dasher/alphabet.Japanese.xml
+share/gnome/dasher/alphabet.Joyo.xml
+share/gnome/dasher/alphabet.Joyo2.xml
+share/gnome/dasher/alphabet.Kannada.xml
+share/gnome/dasher/alphabet.Katakana.xml
 share/gnome/dasher/alphabet.Malay.xml
+share/gnome/dasher/alphabet.Malayalam.xml
+share/gnome/dasher/alphabet.Marathi.xml
 share/gnome/dasher/alphabet.Moldavian.xml
 share/gnome/dasher/alphabet.Ndebele.xml
+share/gnome/dasher/alphabet.Oriya.xml
+share/gnome/dasher/alphabet.Punjabi.xml
 share/gnome/dasher/alphabet.Romanian.xml
 share/gnome/dasher/alphabet.Sami.xml
 share/gnome/dasher/alphabet.ScotsGaelic.xml
 share/gnome/dasher/alphabet.Sepedi.xml
 share/gnome/dasher/alphabet.Sesotho.xml
+share/gnome/dasher/alphabet.Sinhala.xml
 share/gnome/dasher/alphabet.Slovak.xml
 share/gnome/dasher/alphabet.Slovenian.xml
 share/gnome/dasher/alphabet.Swati.xml
 share/gnome/dasher/alphabet.Tajik.xml
+share/gnome/dasher/alphabet.Tamil.xml
+share/gnome/dasher/alphabet.Telugu.xml
 share/gnome/dasher/alphabet.Thai.xml
 share/gnome/dasher/alphabet.Tsonga.xml
 share/gnome/dasher/alphabet.Tswana.xml
@@ -34,12 +50,20 @@ share/gnome/dasher/alphabet.Vietnamese.xml
 share/gnome/dasher/alphabet.Xhosa.xml
 share/gnome/dasher/alphabet.Yoruba.xml
 share/gnome/dasher/alphabet.Zulu.xml
+share/gnome/dasher/alphabet.afrikaans.xml
 share/gnome/dasher/alphabet.albanian.xml
+share/gnome/dasher/alphabet.arabic.xml
+share/gnome/dasher/alphabet.bengali.xml
+share/gnome/dasher/alphabet.bopomofo.xml
+share/gnome/dasher/alphabet.catalan.xml
+share/gnome/dasher/alphabet.chinese.xml
+share/gnome/dasher/alphabet.chineseRuby.xml
 share/gnome/dasher/alphabet.czech.xml
 share/gnome/dasher/alphabet.danish.xml
 share/gnome/dasher/alphabet.dtd
 share/gnome/dasher/alphabet.dutch.xml
 share/gnome/dasher/alphabet.english.xml
+share/gnome/dasher/alphabet.english2.xml
 share/gnome/dasher/alphabet.finnish.xml
 share/gnome/dasher/alphabet.french.xml
 share/gnome/dasher/alphabet.german.xml
@@ -50,33 +74,77 @@ share/gnome/dasher/alphabet.hungarian.xml
 share/gnome/dasher/alphabet.hungarianLowerCase.xml
 share/gnome/dasher/alphabet.ipa.xml
 share/gnome/dasher/alphabet.italian.xml
+share/gnome/dasher/alphabet.klingon.xml
 share/gnome/dasher/alphabet.korean.xml
 share/gnome/dasher/alphabet.mongolian.xml
+share/gnome/dasher/alphabet.mongolian2.xml
 share/gnome/dasher/alphabet.norwegian.xml
+share/gnome/dasher/alphabet.persian.xml
+share/gnome/dasher/alphabet.pinyin.xml
 share/gnome/dasher/alphabet.polish.xml
 share/gnome/dasher/alphabet.portuguese.xml
 share/gnome/dasher/alphabet.russian.xml
 share/gnome/dasher/alphabet.spanish.xml
 share/gnome/dasher/alphabet.swahili.xml
 share/gnome/dasher/alphabet.swedish.xml
+share/gnome/dasher/alphabet.thaana.xml
+share/gnome/dasher/alphabet.venda.xml
 share/gnome/dasher/alphabet.welsh.xml
 share/gnome/dasher/alphabet.xsl
 share/gnome/dasher/colour.dtd
 share/gnome/dasher/colour.hiragana.xml
 share/gnome/dasher/colour.xml
 share/gnome/dasher/dasher.glade
+share/gnome/dasher/training_Afrikaans_ZA.txt
+share/gnome/dasher/training_Assamese_IN.txt
+share/gnome/dasher/training_English_ZA.txt
+share/gnome/dasher/training_Esperanto_XX.txt
+share/gnome/dasher/training_Gujarati_IN.txt
+share/gnome/dasher/training_Hindi_IN.txt
+share/gnome/dasher/training_Japanese_JP.txt
+share/gnome/dasher/training_Kannada_IN.txt
+share/gnome/dasher/training_Kashmiri_IN.txt
+share/gnome/dasher/training_Malayalam_IN.txt
+share/gnome/dasher/training_Marathi_IN.txt
+share/gnome/dasher/training_Ndebele_ZA.txt
+share/gnome/dasher/training_Oriya_IN.txt
+share/gnome/dasher/training_Punjabi_IN.txt
+share/gnome/dasher/training_Punjabi_IPA_IN.txt
+share/gnome/dasher/training_Sepedi_ZA.txt
+share/gnome/dasher/training_Sesotho_ZA.txt
+share/gnome/dasher/training_Sinhala_IN.txt
+share/gnome/dasher/training_Swati_ZA.txt
+share/gnome/dasher/training_Tamil_IN.txt
+share/gnome/dasher/training_Telugu_IN.txt
+share/gnome/dasher/training_Tsonga_ZA.txt
+share/gnome/dasher/training_Tswana_ZA.txt
+share/gnome/dasher/training_Urdu_PK.txt
+share/gnome/dasher/training_Venda_ZA.txt
+share/gnome/dasher/training_Xhosa_ZA.txt
+share/gnome/dasher/training_Zulu_ZA.txt
+share/gnome/dasher/training_albanian_SQ.txt
+share/gnome/dasher/training_bengali_BD.txt
+share/gnome/dasher/training_bengali_bn.txt
 share/gnome/dasher/training_czech_CS.txt
+share/gnome/dasher/training_danish_DK.txt
 share/gnome/dasher/training_dutch_NL.txt
 share/gnome/dasher/training_english_GB.txt
+share/gnome/dasher/training_finnish_FI.txt
 share/gnome/dasher/training_french_FR.txt
 share/gnome/dasher/training_german_DE.txt
+share/gnome/dasher/training_greek_GR.txt
 share/gnome/dasher/training_hebrew_IL.txt
 share/gnome/dasher/training_hiragana60_JP.txt
 share/gnome/dasher/training_hiragana83_JP.txt
+share/gnome/dasher/training_hungarian_HU.txt
 share/gnome/dasher/training_italian_IT.txt
 share/gnome/dasher/training_mongolian_MN.txt
+share/gnome/dasher/training_polish_PL.txt
 share/gnome/dasher/training_portuguese_BR.txt
 share/gnome/dasher/training_russian_RU.txt
+share/gnome/dasher/training_spanish_ES.txt
+share/gnome/dasher/training_swahili_KE.txt
+share/gnome/dasher/training_swedish_SE.txt
 share/gnome/dasher/training_welsh_GB.txt
 share/gnome/help/dasher/C/dasher.xml
 share/gnome/help/dasher/C/figures/figure2.png
@@ -89,12 +157,12 @@ share/gnome/help/dasher/C/figures/prefs5.png
 share/gnome/help/dasher/C/version.xml
 share/gnome/icons/dasher.png
 share/gnome/omf/dasher/dasher-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/dasher/dasher-C.omf 2>/dev/null || /usr/bin/true
 share/locale/ar/LC_MESSAGES/dasher.mo
 share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
 share/locale/bg/LC_MESSAGES/dasher.mo
 share/locale/bn/LC_MESSAGES/dasher.mo
+share/locale/bs/LC_MESSAGES/dasher.mo
 share/locale/ca/LC_MESSAGES/dasher.mo
 share/locale/cs/LC_MESSAGES/dasher.mo
 share/locale/cy/LC_MESSAGES/dasher.mo
@@ -108,7 +176,9 @@ share/locale/et/LC_MESSAGES/dasher.mo
 share/locale/fi/LC_MESSAGES/dasher.mo
 share/locale/fr/LC_MESSAGES/dasher.mo
 share/locale/ga/LC_MESSAGES/dasher.mo
+share/locale/gu/LC_MESSAGES/dasher.mo
 share/locale/he/LC_MESSAGES/dasher.mo
+share/locale/hi/LC_MESSAGES/dasher.mo
 share/locale/hr/LC_MESSAGES/dasher.mo
 share/locale/hu/LC_MESSAGES/dasher.mo
 share/locale/id/LC_MESSAGES/dasher.mo
@@ -116,8 +186,10 @@ share/locale/it/LC_MESSAGES/dasher.mo
 share/locale/ja/LC_MESSAGES/dasher.mo
 share/locale/ko/LC_MESSAGES/dasher.mo
 share/locale/lt/LC_MESSAGES/dasher.mo
+share/locale/mk/LC_MESSAGES/dasher.mo
 share/locale/mn/LC_MESSAGES/dasher.mo
 share/locale/ms/LC_MESSAGES/dasher.mo
+share/locale/nb/LC_MESSAGES/dasher.mo
 share/locale/ne/LC_MESSAGES/dasher.mo
 share/locale/nl/LC_MESSAGES/dasher.mo
 share/locale/no/LC_MESSAGES/dasher.mo
@@ -132,6 +204,8 @@ share/locale/sq/LC_MESSAGES/dasher.mo
 share/locale/sr/LC_MESSAGES/dasher.mo
 share/locale/sr@Latn/LC_MESSAGES/dasher.mo
 share/locale/sv/LC_MESSAGES/dasher.mo
+share/locale/ta/LC_MESSAGES/dasher.mo
+share/locale/tk/LC_MESSAGES/dasher.mo
 share/locale/tr/LC_MESSAGES/dasher.mo
 share/locale/uk/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
@@ -141,4 +215,3 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo
 @dirrm share/gnome/help/dasher/C
 @dirrm share/gnome/help/dasher
 @dirrm share/gnome/dasher
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/dasher/dasher-C.omf 2>/dev/null || /usr/bin/true
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index bafc1568f22c..c0d6693a3696 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnopernicus
-PORTVERSION=	0.9.19
-PORTREVISION=	1
+PORTVERSION=	0.10.4
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -30,7 +29,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAKE_ENV=	SED="${SED}"
 
 GCONF_SCHEMAS=	brlmonitor.schemas gnopernicus.schemas remote.schemas
-SHLIB_VERSION=	19
+SHLIB_VERSION=	4
 PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
 
 post-patch:
diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo
index 3525083d053d..4fe27d652517 100644
--- a/accessibility/gnopernicus/distinfo
+++ b/accessibility/gnopernicus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnopernicus-0.9.19.tar.bz2) = f301f7f7a7324289f44ad7b33bf0282e
-SIZE (gnome2/gnopernicus-0.9.19.tar.bz2) = 1927562
+MD5 (gnome2/gnopernicus-0.10.4.tar.bz2) = cb105fa21d63e83c352a1f606d601196
+SIZE (gnome2/gnopernicus-0.10.4.tar.bz2) = 1953427
diff --git a/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c
new file mode 100644
index 000000000000..86addc0fc0c7
--- /dev/null
+++ b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c
@@ -0,0 +1,14 @@
+--- srlow/libsrlow/SRObject.c.orig	Mon Feb 28 17:11:27 2005
++++ srlow/libsrlow/SRObject.c	Mon Feb 28 17:11:41 2005
+@@ -4206,9 +4206,10 @@
+     offset = AccessibleText_getCaretOffset (acc_text);
+     if (offset == AccessibleText_getCharacterCount (acc_text) && offset > 0)
+ 	{
++		char *ret;
+ 		offset--;
+ 		last = TRUE;/*the char is the last char in the text*/
+-		char *ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, 
++		ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, 
+ 					SPI_TEXT_BOUNDARY_LINE_START, &line_start_offset, &line_end_offset);
+ 		SPI_freeString (ret);
+ 		if (offset == line_start_offset && offset > 0)
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 92608ea0f0f2..c8454aea254f 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gok
-PORTVERSION=	0.11.17
-PORTREVISION=	1
+PORTVERSION=	1.0.2
 CATEGORIES=	accessibility sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo
index a73abe7973dd..d47bf4756a68 100644
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gok-0.11.17.tar.bz2) = 6d76c815e7d453cdbfc31f4c45659573
-SIZE (gnome2/gok-0.11.17.tar.bz2) = 1351575
+MD5 (gnome2/gok-1.0.2.tar.bz2) = c4ec4fcd39d43fc0aa43a222ff7ff7cb
+SIZE (gnome2/gok-1.0.2.tar.bz2) = 1440562
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index bfdaf701d972..560485898394 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -409,6 +409,16 @@ share/gnome/gok/nb/numberpad.kbd
 share/gnome/gok/nb/quit.kbd
 share/gnome/gok/nb/text-operations.kbd
 share/gnome/gok/nb/valuator.kbd
+share/gnome/gok/ne/gok-controls.kbd
+share/gnome/gok/ne/hide.kbd
+share/gnome/gok/ne/launcher.kbd
+share/gnome/gok/ne/main.kbd
+share/gnome/gok/ne/mouse.kbd
+share/gnome/gok/ne/move-resize.kbd
+share/gnome/gok/ne/numberpad.kbd
+share/gnome/gok/ne/quit.kbd
+share/gnome/gok/ne/text-operations.kbd
+share/gnome/gok/ne/valuator.kbd
 share/gnome/gok/nl/gok-controls.kbd
 share/gnome/gok/nl/hide.kbd
 share/gnome/gok/nl/launcher.kbd
@@ -472,6 +482,16 @@ share/gnome/gok/pt_BR/text-operations.kbd
 share/gnome/gok/pt_BR/valuator.kbd
 share/gnome/gok/quit.kbd
 share/gnome/gok/qwerty.kbd
+share/gnome/gok/ro/gok-controls.kbd
+share/gnome/gok/ro/hide.kbd
+share/gnome/gok/ro/launcher.kbd
+share/gnome/gok/ro/main.kbd
+share/gnome/gok/ro/mouse.kbd
+share/gnome/gok/ro/move-resize.kbd
+share/gnome/gok/ro/numberpad.kbd
+share/gnome/gok/ro/quit.kbd
+share/gnome/gok/ro/text-operations.kbd
+share/gnome/gok/ro/valuator.kbd
 share/gnome/gok/singlekey-automatic-scanning.xam
 share/gnome/gok/singlekey-inverse-scanning.xam
 share/gnome/gok/sl/gok-controls.kbd
@@ -619,12 +639,14 @@ share/locale/ml/LC_MESSAGES/gok.mo
 share/locale/mn/LC_MESSAGES/gok.mo
 share/locale/ms/LC_MESSAGES/gok.mo
 share/locale/nb/LC_MESSAGES/gok.mo
+share/locale/ne/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
 share/locale/no/LC_MESSAGES/gok.mo
 share/locale/pa/LC_MESSAGES/gok.mo
 share/locale/pl/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
 share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/ro/LC_MESSAGES/gok.mo
 share/locale/sl/LC_MESSAGES/gok.mo
 share/locale/sq/LC_MESSAGES/gok.mo
 share/locale/sr/LC_MESSAGES/gok.mo
@@ -648,12 +670,14 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo
 @dirrm share/gnome/gok/sr
 @dirrm share/gnome/gok/sq
 @dirrm share/gnome/gok/sl
+@dirrm share/gnome/gok/ro
 @dirrm share/gnome/gok/pt_BR
 @dirrm share/gnome/gok/pt
 @dirrm share/gnome/gok/pl
 @dirrm share/gnome/gok/pa
 @dirrm share/gnome/gok/no
 @dirrm share/gnome/gok/nl
+@dirrm share/gnome/gok/ne
 @dirrm share/gnome/gok/nb
 @dirrm share/gnome/gok/ms
 @dirrm share/gnome/gok/mn