Update to 0.50 - lots, and lots, and lots of updates, bugfixes

and general cleanups

10 files changed, 72 insertions, 170 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 114f24f06953..9de020af86f1 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.48
+# Version required:			0.50
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnumeric-0.48
+DISTNAME=	gnumeric-0.50
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	gnomeprint.5:${PORTSDIR}/print/gnomeprint \
+LIB_DEPENDS=	gnomeprint.6:${PORTSDIR}/print/gnomeprint \
 		glade.3:${PORTSDIR}/devel/libglade
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 594ec8f04f56..7c047d79628f 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.48.tar.gz) = 7cf41733b6f7e3238a07229e22075617
+MD5 (gnumeric-0.50.tar.gz) = d1786dfc30fd72548401cd5850004744
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index f6f19c4e21f8..96ba3a32868a 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,17 +1,6 @@
---- configure.orig	Sat Jan 22 11:31:42 2000
-+++ configure	Tue Jan 25 12:19:20 2000
-@@ -2294,8 +2294,8 @@
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
- DLLTOOL="$DLLTOOL" AS="$AS" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Redirect the config.log output again, so that the ltconfig log is not
-@@ -2790,7 +2790,7 @@
+--- configure.orig	Sun Mar 26 22:19:54 2000
++++ configure	Mon Mar 27 11:48:57 2000
+@@ -2504,7 +2504,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -20,25 +9,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3335,7 +3335,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
-+LIBS="`xml-config --libs` $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3341 "configure"
- #include "confdefs.h"
-@@ -3365,7 +3365,7 @@
-   echo "$ac_t""yes" 1>&6
-   
- 		
--		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
-+		GNOME_XML_LIB=`xml-config --libs`
- 	
- else
-   echo "$ac_t""no" 1>&6
-@@ -5602,15 +5602,16 @@
+@@ -5316,15 +5316,15 @@
  fi
  
          
@@ -48,8 +19,7 @@
          INSTOBJEXT=.mo
          DATADIRNAME=share
 -	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+	INTLDEPS="-lintl"
++	INTLDEPS='-lintl'
  	INTLLIBS=$INTLDEPS
  	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 -        nls_cv_header_intl=intl/libintl.h
@@ -59,30 +29,10 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6122,7 +6123,7 @@
- echo $ac_n "checking for GnomePrint libraries >= 0.10""... $ac_c" 1>&6
- echo "configure:6124: checking for GnomePrint libraries >= 0.10" >&5
- if gnome-config --libs print > /dev/null 2>&1; then 
--    vers=`(. \`gnome-config --libdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \
-+    vers=`(. \`$GNOME_CONFIG --sysconfdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \
-         awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-     if test "$vers" -ge 10; then
-         echo "$ac_t""found" 1>&6
-@@ -6135,8 +6136,8 @@
- 
- echo $ac_n "checking for Glade libraries >= 0.11""... $ac_c" 1>&6
- echo "configure:6138: checking for Glade libraries >= 0.11" >&5
--if gnome-config --libs libglade > /dev/null 2>&1; then 
--    vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-+if libglade-config --libs > /dev/null 2>&1; then 
-+    vers=`libglade-config --version | sed -e 's/libglade //' | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-     if test "$vers" -ge 11; then
-         echo "$ac_t""found" 1>&6
-     else
-@@ -6148,8 +6149,8 @@
+@@ -5873,8 +5873,8 @@
  
  echo $ac_n "checking for GTK >= 1.2.2""... $ac_c" 1>&6
- echo "configure:6151: checking for GTK >= 1.2.2" >&5
+ echo "configure:5876: checking for GTK >= 1.2.2" >&5
 -if gtk-config --version > /dev/null 2>&1; then 
 -        vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 +if $GTK_CONFIG --version > /dev/null 2>&1; then 
@@ -90,14 +40,3 @@
      if test "$vers" -ge 1002002; then
          echo "$ac_t""found" 1>&6
      else
-@@ -6159,8 +6160,8 @@
-     { echo "configure: error: Did not find GTK+ installed" 1>&2; exit 1; }
- fi
- 
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo $gb`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo $gb`
-+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui print $bonobo $gb` `libglade-config --libs gnome`"
-+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnomeui print $bonobo $gb` `libglade-config --cflags gnome`"
- 
- 
- 
diff --git a/math/gnumeric/files/patch-ba b/math/gnumeric/files/patch-ba
index 1cfa4d498f84..cd1807b2624a 100644
--- a/math/gnumeric/files/patch-ba
+++ b/math/gnumeric/files/patch-ba
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Fri Jul  9 22:17:31 1999
-+++ Makefile.in	Mon Jul 12 16:51:07 1999
-@@ -140,7 +140,7 @@
+--- Makefile.in.orig	Sun Mar 26 22:20:39 2000
++++ Makefile.in	Mon Mar 27 12:04:17 2000
+@@ -146,7 +146,7 @@
  perl_val = @perl_val@
  python_val = @python_val@
  
--SUBDIRS = intl po macros plugins src doc icons
-+SUBDIRS = intl po macros plugins src icons
+-SUBDIRS = intl po macros idl plugins wizards src graph doc icons
++SUBDIRS = intl po macros idl plugins wizards src graph icons
  
- EXTRA_DIST =  	gnumeric.desktop README HACKING gnumeric.spec.in 		gnumeric.keys.in gnumeric.mime $(appicon_DATA) 			gnumeric.gnorba
+ change_logs =  	OOChangeLog OChangeLog ChangeLog
+ 
+@@ -158,7 +158,7 @@
+ appicon_DATA = gnome-gnumeric.png                gnome-application-x-gnumeric.png                gnome-application-x-xls.png
  
-@@ -148,7 +148,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-gnumeric.png gnome-gnumeric-xl.png
  
 -Applicationsdir = $(datadir)/gnome/apps/Applications
 +Applicationsdir = $(datadir)/apps/Applications
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 64012b6fc5b5..2d9c3971670c 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,6 +1,9 @@
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
+etc/CORBA/servers/graph.gnorba
 share/gnome/apps/Applications/gnumeric.desktop
+share/gnome/gnumeric/glade/advanced-filter.glade
+share/gnome/gnumeric/glade/analysis-tools.glade
 share/gnome/gnumeric/glade/autocorrect-exceptions.glade
 share/gnome/gnumeric/glade/autocorrect.glade
 share/gnome/gnumeric/glade/autosave-prompt.glade
@@ -9,17 +12,24 @@ share/gnome/gnumeric/glade/cell-format.glade
 share/gnome/gnumeric/glade/cell-sort.glade
 share/gnome/gnumeric/glade/col-width.glade
 share/gnome/gnumeric/glade/delete-cells.glade
+share/gnome/gnumeric/glade/dialog-stf.glade
 share/gnome/gnumeric/glade/dialog-zoom.glade
 share/gnome/gnumeric/glade/font-sel.glade
+share/gnome/gnumeric/glade/function-select.glade
+share/gnome/gnumeric/glade/graphics.glade
 share/gnome/gnumeric/glade/hf-config.glade
 share/gnome/gnumeric/glade/import.glade
 share/gnome/gnumeric/glade/insert-cells.glade
 share/gnome/gnumeric/glade/names.glade
+share/gnome/gnumeric/glade/plugin-manager.glade
 share/gnome/gnumeric/glade/print.glade
 share/gnome/gnumeric/glade/row-height.glade
+share/gnome/gnumeric/glade/sheet-order.glade
 share/gnome/gnumeric/glade/sheet-rename.glade
-share/gnome/gnumeric/glade/stf.glade
+share/gnome/gnumeric/glade/solver-options.glade
+share/gnome/gnumeric/glade/solver.glade
 share/gnome/gnumeric/glade/summary.glade
+share/gnome/gnumeric/glade/workbook-attr.glade
 share/gnome/gnumeric/guile/functions.scm
 share/gnome/gnumeric/guile/gnumeric_startup.scm
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_csv.so
@@ -29,17 +39,17 @@ share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_html.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_lotus.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_oleo.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sc.so
-share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stf.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sylk.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_text.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_xbase.so
 share/gnome/gnumeric/python/gnumeric_startup.py
 share/gnome/idl/Gnumeric.idl
-share/gnome/idl/Gnumeric-value.idl
+share/gnome/idl/Graph.idl
 share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
-share/gnome/pixmaps/gnome-gnumeric-xl.png
+share/gnome/pixmaps/gnome-application-x-gnumeric.png
+share/gnome/pixmaps/gnome-application-x-xls.png
 share/gnome/pixmaps/gnome-gnumeric.png
 share/gnome/pixmaps/gnumeric/bottom_border
 share/gnome/pixmaps/gnumeric/chart_area_1_1.png
@@ -175,6 +185,7 @@ share/locale/es_SV/LC_MESSAGES/gnumeric.mo
 share/locale/et/LC_MESSAGES/gnumeric.mo
 share/locale/fi/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric.mo
+share/locale/ga/LC_MESSAGES/gnumeric.mo
 share/locale/hr/LC_MESSAGES/gnumeric.mo
 share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
@@ -189,6 +200,7 @@ share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
 share/locale/uk/LC_MESSAGES/gnumeric.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/glade
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 114f24f06953..9de020af86f1 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.48
+# Version required:			0.50
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnumeric-0.48
+DISTNAME=	gnumeric-0.50
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	gnomeprint.5:${PORTSDIR}/print/gnomeprint \
+LIB_DEPENDS=	gnomeprint.6:${PORTSDIR}/print/gnomeprint \
 		glade.3:${PORTSDIR}/devel/libglade
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 594ec8f04f56..7c047d79628f 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.48.tar.gz) = 7cf41733b6f7e3238a07229e22075617
+MD5 (gnumeric-0.50.tar.gz) = d1786dfc30fd72548401cd5850004744
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index f6f19c4e21f8..96ba3a32868a 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,17 +1,6 @@
---- configure.orig	Sat Jan 22 11:31:42 2000
-+++ configure	Tue Jan 25 12:19:20 2000
-@@ -2294,8 +2294,8 @@
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
- DLLTOOL="$DLLTOOL" AS="$AS" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Redirect the config.log output again, so that the ltconfig log is not
-@@ -2790,7 +2790,7 @@
+--- configure.orig	Sun Mar 26 22:19:54 2000
++++ configure	Mon Mar 27 11:48:57 2000
+@@ -2504,7 +2504,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -20,25 +9,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3335,7 +3335,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
-+LIBS="`xml-config --libs` $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3341 "configure"
- #include "confdefs.h"
-@@ -3365,7 +3365,7 @@
-   echo "$ac_t""yes" 1>&6
-   
- 		
--		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
-+		GNOME_XML_LIB=`xml-config --libs`
- 	
- else
-   echo "$ac_t""no" 1>&6
-@@ -5602,15 +5602,16 @@
+@@ -5316,15 +5316,15 @@
  fi
  
          
@@ -48,8 +19,7 @@
          INSTOBJEXT=.mo
          DATADIRNAME=share
 -	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+	INTLDEPS="-lintl"
++	INTLDEPS='-lintl'
  	INTLLIBS=$INTLDEPS
  	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 -        nls_cv_header_intl=intl/libintl.h
@@ -59,30 +29,10 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6122,7 +6123,7 @@
- echo $ac_n "checking for GnomePrint libraries >= 0.10""... $ac_c" 1>&6
- echo "configure:6124: checking for GnomePrint libraries >= 0.10" >&5
- if gnome-config --libs print > /dev/null 2>&1; then 
--    vers=`(. \`gnome-config --libdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \
-+    vers=`(. \`$GNOME_CONFIG --sysconfdir\`/printConf.sh && echo $MODULE_VERSION | sed -e "s/gnome-print-//" ) | \
-         awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-     if test "$vers" -ge 10; then
-         echo "$ac_t""found" 1>&6
-@@ -6135,8 +6136,8 @@
- 
- echo $ac_n "checking for Glade libraries >= 0.11""... $ac_c" 1>&6
- echo "configure:6138: checking for Glade libraries >= 0.11" >&5
--if gnome-config --libs libglade > /dev/null 2>&1; then 
--    vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-+if libglade-config --libs > /dev/null 2>&1; then 
-+    vers=`libglade-config --version | sed -e 's/libglade //' | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-     if test "$vers" -ge 11; then
-         echo "$ac_t""found" 1>&6
-     else
-@@ -6148,8 +6149,8 @@
+@@ -5873,8 +5873,8 @@
  
  echo $ac_n "checking for GTK >= 1.2.2""... $ac_c" 1>&6
- echo "configure:6151: checking for GTK >= 1.2.2" >&5
+ echo "configure:5876: checking for GTK >= 1.2.2" >&5
 -if gtk-config --version > /dev/null 2>&1; then 
 -        vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 +if $GTK_CONFIG --version > /dev/null 2>&1; then 
@@ -90,14 +40,3 @@
      if test "$vers" -ge 1002002; then
          echo "$ac_t""found" 1>&6
      else
-@@ -6159,8 +6160,8 @@
-     { echo "configure: error: Did not find GTK+ installed" 1>&2; exit 1; }
- fi
- 
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo $gb`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo $gb`
-+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui print $bonobo $gb` `libglade-config --libs gnome`"
-+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnomeui print $bonobo $gb` `libglade-config --cflags gnome`"
- 
- 
- 
diff --git a/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba
index 1cfa4d498f84..cd1807b2624a 100644
--- a/math/gnumeric2/files/patch-ba
+++ b/math/gnumeric2/files/patch-ba
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Fri Jul  9 22:17:31 1999
-+++ Makefile.in	Mon Jul 12 16:51:07 1999
-@@ -140,7 +140,7 @@
+--- Makefile.in.orig	Sun Mar 26 22:20:39 2000
++++ Makefile.in	Mon Mar 27 12:04:17 2000
+@@ -146,7 +146,7 @@
  perl_val = @perl_val@
  python_val = @python_val@
  
--SUBDIRS = intl po macros plugins src doc icons
-+SUBDIRS = intl po macros plugins src icons
+-SUBDIRS = intl po macros idl plugins wizards src graph doc icons
++SUBDIRS = intl po macros idl plugins wizards src graph icons
  
- EXTRA_DIST =  	gnumeric.desktop README HACKING gnumeric.spec.in 		gnumeric.keys.in gnumeric.mime $(appicon_DATA) 			gnumeric.gnorba
+ change_logs =  	OOChangeLog OChangeLog ChangeLog
+ 
+@@ -158,7 +158,7 @@
+ appicon_DATA = gnome-gnumeric.png                gnome-application-x-gnumeric.png                gnome-application-x-xls.png
  
-@@ -148,7 +148,7 @@
- appicondir = $(datadir)/pixmaps
- appicon_DATA = gnome-gnumeric.png gnome-gnumeric-xl.png
  
 -Applicationsdir = $(datadir)/gnome/apps/Applications
 +Applicationsdir = $(datadir)/apps/Applications
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 64012b6fc5b5..2d9c3971670c 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,6 +1,9 @@
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
+etc/CORBA/servers/graph.gnorba
 share/gnome/apps/Applications/gnumeric.desktop
+share/gnome/gnumeric/glade/advanced-filter.glade
+share/gnome/gnumeric/glade/analysis-tools.glade
 share/gnome/gnumeric/glade/autocorrect-exceptions.glade
 share/gnome/gnumeric/glade/autocorrect.glade
 share/gnome/gnumeric/glade/autosave-prompt.glade
@@ -9,17 +12,24 @@ share/gnome/gnumeric/glade/cell-format.glade
 share/gnome/gnumeric/glade/cell-sort.glade
 share/gnome/gnumeric/glade/col-width.glade
 share/gnome/gnumeric/glade/delete-cells.glade
+share/gnome/gnumeric/glade/dialog-stf.glade
 share/gnome/gnumeric/glade/dialog-zoom.glade
 share/gnome/gnumeric/glade/font-sel.glade
+share/gnome/gnumeric/glade/function-select.glade
+share/gnome/gnumeric/glade/graphics.glade
 share/gnome/gnumeric/glade/hf-config.glade
 share/gnome/gnumeric/glade/import.glade
 share/gnome/gnumeric/glade/insert-cells.glade
 share/gnome/gnumeric/glade/names.glade
+share/gnome/gnumeric/glade/plugin-manager.glade
 share/gnome/gnumeric/glade/print.glade
 share/gnome/gnumeric/glade/row-height.glade
+share/gnome/gnumeric/glade/sheet-order.glade
 share/gnome/gnumeric/glade/sheet-rename.glade
-share/gnome/gnumeric/glade/stf.glade
+share/gnome/gnumeric/glade/solver-options.glade
+share/gnome/gnumeric/glade/solver.glade
 share/gnome/gnumeric/glade/summary.glade
+share/gnome/gnumeric/glade/workbook-attr.glade
 share/gnome/gnumeric/guile/functions.scm
 share/gnome/gnumeric/guile/gnumeric_startup.scm
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_csv.so
@@ -29,17 +39,17 @@ share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_html.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_lotus.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_oleo.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sc.so
-share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stf.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sylk.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_text.so
 share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_xbase.so
 share/gnome/gnumeric/python/gnumeric_startup.py
 share/gnome/idl/Gnumeric.idl
-share/gnome/idl/Gnumeric-value.idl
+share/gnome/idl/Graph.idl
 share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
-share/gnome/pixmaps/gnome-gnumeric-xl.png
+share/gnome/pixmaps/gnome-application-x-gnumeric.png
+share/gnome/pixmaps/gnome-application-x-xls.png
 share/gnome/pixmaps/gnome-gnumeric.png
 share/gnome/pixmaps/gnumeric/bottom_border
 share/gnome/pixmaps/gnumeric/chart_area_1_1.png
@@ -175,6 +185,7 @@ share/locale/es_SV/LC_MESSAGES/gnumeric.mo
 share/locale/et/LC_MESSAGES/gnumeric.mo
 share/locale/fi/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric.mo
+share/locale/ga/LC_MESSAGES/gnumeric.mo
 share/locale/hr/LC_MESSAGES/gnumeric.mo
 share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
@@ -189,6 +200,7 @@ share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
 share/locale/uk/LC_MESSAGES/gnumeric.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/glade