Update to 0.9.4.

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

5 files changed, 91 insertions, 27 deletions

diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index dfe375ff4..b0ea91368 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnopernicus
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.4
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo
index 615278ac3..ac848e659 100644
--- a/accessibility/gnopernicus/distinfo
+++ b/accessibility/gnopernicus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnopernicus-0.9.2.tar.bz2) = 4adf2c02de2459620f1a1356b569c627
-SIZE (gnome2/gnopernicus-0.9.2.tar.bz2) = 1550707
+MD5 (gnome2/gnopernicus-0.9.4.tar.bz2) = 1df088a412fe662e4371993f8773174c
+SIZE (gnome2/gnopernicus-0.9.4.tar.bz2) = 1524869
diff --git a/accessibility/gnopernicus/files/patch-srcore_srbrl.c b/accessibility/gnopernicus/files/patch-srcore_srbrl.c
new file mode 100644
index 000000000..6c9b6b818
--- /dev/null
+++ b/accessibility/gnopernicus/files/patch-srcore_srbrl.c
@@ -0,0 +1,50 @@
+--- srcore/srbrl.c.orig	Sun May 30 03:10:22 2004
++++ srcore/srbrl.c	Sun May 30 03:11:59 2004
+@@ -724,6 +724,11 @@
+ src_braille_load_values (SRCBraille *braille)
+ {
+     gint default_int_val;
++    gint default_pos_sensor;
++    gint default_opt_sensor;
++    gchar *default_braille_transaltion_table;
++    gchar *default_braille_style;
++    gchar *default_braille_cursor_style;
+     
+     sru_assert (braille);
+     
+@@ -751,7 +756,7 @@
+ 	}					  
+     }    
+     
+-    gchar *default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION;
++    default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_TRANSLATION, CFGT_STRING, 
+ 					  &braille->translation_table, 
+ 					  default_braille_transaltion_table);		
+@@ -763,22 +768,22 @@
+     }
+ 	
+     
+-    gchar *default_braille_style = DEFAULT_BRAILLE_STYLE;
++    default_braille_style = DEFAULT_BRAILLE_STYLE;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_STYLE, CFGT_STRING, 
+ 					  &braille->style, 
+ 					  default_braille_style);
+ 					  
+-    gchar *default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE;
++    default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_CURSOR_STYLE, CFGT_STRING, 
+ 					  &braille->cursor_style, 
+ 					  default_braille_cursor_style);
+ 					  
+-    gint default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR;
++    default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_POSITION_SENSOR, CFGT_INT, 
+ 					  &braille->position_sensor, 
+ 					  &default_pos_sensor);
+     
+-    gint default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR;
++    default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_OPTICAL_SENSOR, CFGT_INT, 
+ 					  &braille->optical_sensor, 
+ 					  &default_opt_sensor);
diff --git a/accessibility/gnopernicus/files/patch-srcore_srmain.c b/accessibility/gnopernicus/files/patch-srcore_srmain.c
new file mode 100644
index 000000000..7b113f5ba
--- /dev/null
+++ b/accessibility/gnopernicus/files/patch-srcore_srmain.c
@@ -0,0 +1,26 @@
+--- srcore/srmain.c.orig	Sun May 30 03:08:45 2004
++++ srcore/srmain.c	Sun May 30 03:09:28 2004
+@@ -602,9 +602,10 @@
+     sru_assert (config->key);
+     if (strcmp (config->key, BRAILLE_DEVICE) == 0)
+     {
++	gboolean rv;
+ 	sru_assert (config->newvalue && config->type == CFGT_STRING);
+ 	
+-	gboolean rv = src_braille_set_device ((gchar*)config->newvalue);   
++	rv = src_braille_set_device ((gchar*)config->newvalue);   
+ 	if (!rv)
+ 	{
+ 	    sru_message ("SR: process config changed for braille: brl_device did not change!!!");
+@@ -636,9 +637,10 @@
+     }
+     else if (strcmp (config->key, BRAILLE_TRANSLATION) == 0)
+     {
++	gboolean rv;
+     	sru_assert (config->type == CFGT_STRING && config->newvalue);
+ 	
+-	gboolean rv = src_braille_set_translation_table ((gchar*)config->newvalue);
++	rv = src_braille_set_translation_table ((gchar*)config->newvalue);
+ 	
+ 	if (!rv)
+ 	{
diff --git a/accessibility/gnopernicus/pkg-plist b/accessibility/gnopernicus/pkg-plist
index ec0123c70..c3e9ba9ba 100644
--- a/accessibility/gnopernicus/pkg-plist
+++ b/accessibility/gnopernicus/pkg-plist
@@ -8,7 +8,6 @@ etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/braille_key/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/key_pad/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/ACS-S/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK00/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01DK02/%gconf.xml
@@ -96,7 +95,6 @@ etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K01/%gconf
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K02/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K03/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/user_key/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/brlmon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/remote/%gconf.xml
@@ -117,7 +115,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/braille_key/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/key_pad/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/ACS-S/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK00/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01DK02/%gconf.xml
@@ -205,7 +202,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K0
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K02/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K03/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K04/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/user_key/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/brlmon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/remote/%gconf.xml
@@ -240,30 +236,27 @@ include/gnopernicus-1.0/libsrutil/srintl.h
 include/gnopernicus-1.0/libsrutil/util.h
 lib/gnopernicus-1.0/libbrl.a
 lib/gnopernicus-1.0/libbrl.so
-lib/gnopernicus-1.0/libbrl.so.2
+lib/gnopernicus-1.0/libbrl.so.4
 lib/gnopernicus-1.0/libke.a
 lib/gnopernicus-1.0/libke.so
-lib/gnopernicus-1.0/libke.so.2
+lib/gnopernicus-1.0/libke.so.4
 lib/gnopernicus-1.0/libmag.a
 lib/gnopernicus-1.0/libmag.so
-lib/gnopernicus-1.0/libmag.so.2
+lib/gnopernicus-1.0/libmag.so.4
 lib/gnopernicus-1.0/libsrconf.a
 lib/gnopernicus-1.0/libsrconf.so
-lib/gnopernicus-1.0/libsrconf.so.2
+lib/gnopernicus-1.0/libsrconf.so.4
 lib/gnopernicus-1.0/libsrlow.a
 lib/gnopernicus-1.0/libsrlow.so
-lib/gnopernicus-1.0/libsrlow.so.2
+lib/gnopernicus-1.0/libsrlow.so.4
 lib/gnopernicus-1.0/libsrs.a
 lib/gnopernicus-1.0/libsrs.so
-lib/gnopernicus-1.0/libsrs.so.2
+lib/gnopernicus-1.0/libsrs.so.4
 lib/gnopernicus-1.0/libsrutil.a
 lib/gnopernicus-1.0/libsrutil.so
-lib/gnopernicus-1.0/libsrutil.so.2
+lib/gnopernicus-1.0/libsrutil.so.4
 libdata/pkgconfig/gnopernicus-1.0.pc
 share/gnome/applications/gnopernicus.desktop
-share/gnome/gnopernicus/fonts/braillehc.afm
-share/gnome/gnopernicus/fonts/braillehc.pfb
-share/gnome/gnopernicus/fonts/braillehc.pfm
 share/gnome/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings/braille_monitor_settings.glade2
 share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/attribute_settings.glade2
 share/gnome/gnopernicus/glade/gnopi_files/Braille_Settings/braille_device.glade2
@@ -295,18 +288,18 @@ share/gnome/gnopernicus/presentation/default.xml
 share/gnome/gnopernicus/presentation/verbose.xml
 share/gnome/help/brlmonitor/C/brlmonitor.xml
 share/gnome/help/brlmonitor/C/legal.xml
-share/gnome/help/gnopernicus/C/gnopernicus.xml
-share/gnome/help/gnopernicus/C/legal.xml
 share/gnome/help/brlmonitor/es/brlmonitor.xml
 share/gnome/help/brlmonitor/es/legal.xml
+share/gnome/help/gnopernicus/C/gnopernicus.xml
+share/gnome/help/gnopernicus/C/legal.xml
 share/gnome/help/gnopernicus/es/gnopernicus.xml
 share/gnome/help/gnopernicus/es/legal.xml
 share/gnome/omf/gnopernicus/brlmonitor-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnopernicus/gnopernicus-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnopernicus/brlmonitor-es.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnopernicus/gnopernicus-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnopernicus/gnopernicus-es.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnopernicus/gnopernicus-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnopernicus.png
@@ -370,7 +363,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 @dirrm share/gnome/gnopernicus/glade/gnopi_files/Braille_Monitor_Settings
 @dirrm share/gnome/gnopernicus/glade/gnopi_files
 @dirrm share/gnome/gnopernicus/glade
-@dirrm share/gnome/gnopernicus/fonts
 @dirrm share/gnome/gnopernicus
 @dirrm lib/gnopernicus-1.0
 @dirrm include/gnopernicus-1.0/libsrutil
@@ -396,7 +388,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/remote
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config/brlmon
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/config
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/user_key
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K04
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K03
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/L10K02
@@ -484,7 +475,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01DK02
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK01
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/DK00
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard/ACS-S
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/key_pad
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnopernicus/command_map/braille_key
@@ -505,7 +495,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/remote
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config/brlmon
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/config
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/user_key
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K04
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K03
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/L10K02
@@ -593,7 +582,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01DK02
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK01
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/DK00
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard/ACS-S
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/keyboard
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/key_pad
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/command_map/braille_key
@@ -602,6 +590,6 @@ share/locale/zh_CN/LC_MESSAGES/gnopernicus.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus/braille
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnopernicus
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/brlmonitor-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnopernicus/gnopernicus-es.omf 2>/dev/null || /usr/bin/true