Update to 0.44

PR:		ports/15122
Submitted by:	Ade Lovett <ade@lovett.com>

8 files changed, 138 insertions, 52 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 04d6fcc76b38..682476847ca6 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.41
+# Version required:			0.44
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnumeric-0.41
+DISTNAME=	gnumeric-0.44
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnumeric
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 51e131c54af0..7f432238dc32 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.41.tar.gz) = 1b03122ce3755c1841434b6723355670
+MD5 (gnumeric-0.44.tar.gz) = 403492503ca0f9be56d676cc0a728514
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index adac3612390f..5fa40f195778 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Oct 19 09:12:29 1999
-+++ configure	Wed Oct 20 11:59:28 1999
-@@ -2788,7 +2788,7 @@
+--- configure.orig	Fri Nov 19 15:59:10 1999
++++ configure	Sat Nov 27 14:06:34 1999
+@@ -2790,7 +2790,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -9,25 +9,25 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3333,7 +3333,7 @@
+@@ -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 3339 "configure"
+ #line 3341 "configure"
  #include "confdefs.h"
-@@ -3364,7 +3364,7 @@
+@@ -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
-@@ -5600,15 +5600,15 @@
+@@ -5602,15 +5602,15 @@
  fi
  
          
@@ -47,19 +47,19 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6056,7 +6056,7 @@
- echo "configure:6057: checking for GnomePrint libraries" >&5
+@@ -6110,7 +6110,7 @@
+ echo "configure:6111: checking for GnomePrint libraries" >&5
  if gnome-config --libs print > /dev/null 2>&1; then 
      echo "$ac_t""found" 1>&6
 -    . `gnome-config --libdir`/printConf.sh
 +    . `gnome-config --sysconfdir`/printConf.sh
      echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6
- echo "configure:6062: checking for GnomePrint >= 0.8" >&5
+ echo "configure:6116: checking for GnomePrint >= 0.8" >&5
      case x$MODULE_VERSION in
-@@ -6071,14 +6071,14 @@
+@@ -6125,14 +6125,14 @@
  
  echo $ac_n "checking for Glade libraries""... $ac_c" 1>&6
- echo "configure:6074: checking for Glade libraries" >&5
+ echo "configure:6128: checking for Glade libraries" >&5
 -if gnome-config --libs libglade > /dev/null 2>&1; then 
 +if libglade-config --libs > /dev/null 2>&1; then 
      echo "$ac_t""found" 1>&6
@@ -67,10 +67,10 @@
      { echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; }
  fi
  
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo`
-+EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print $bonobo` `libglade-config --libs gnome`"
-+EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print $bonobo` `libglade-config --cflags gnome`"
+-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/pkg-plist b/math/gnumeric/pkg-plist
index 83dd53dc9ba3..668abc136d27 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,6 +1,8 @@
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
 share/gnome/apps/Applications/gnumeric.desktop
+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-zoom.glade
@@ -13,13 +15,13 @@ share/gnome/gnumeric/glade/print.glade
 share/gnome/gnumeric/glade/row-height.glade
 share/gnome/gnumeric/glade/sheet-rename.glade
 share/gnome/gnumeric/glade/summary.glade
-share/gnome/gnumeric/guile/gnumeric_startup.scm
 share/gnome/gnumeric/plugins/libcsv.so
-share/gnome/gnumeric/plugins/libgnumguile.so
 share/gnome/gnumeric/plugins/libhtml.so
 share/gnome/gnumeric/plugins/liblotus.so
+share/gnome/gnumeric/plugins/liboleo.so
 share/gnome/gnumeric/plugins/libpython.so
 share/gnome/gnumeric/plugins/libstat.so
+share/gnome/gnumeric/plugins/libsylk.so
 share/gnome/gnumeric/plugins/libtext.so
 share/gnome/gnumeric/plugins/libxbase.so
 share/gnome/gnumeric/python/gnumeric_startup.py
@@ -30,6 +32,7 @@ share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
 share/gnome/pixmaps/gnome-gnumeric-xl.png
 share/gnome/pixmaps/gnome-gnumeric.png
+share/gnome/pixmaps/gnumeric/bottom_border
 share/gnome/pixmaps/gnumeric/chart_area_1_1.png
 share/gnome/pixmaps/gnumeric/chart_area_1_2.png
 share/gnome/pixmaps/gnumeric/chart_area_1_3.png
@@ -103,10 +106,51 @@ share/gnome/pixmaps/gnumeric/chart_surface_1_1.png
 share/gnome/pixmaps/gnumeric/chart_surface_1_2.png
 share/gnome/pixmaps/gnumeric/chart_surface_2_1.png
 share/gnome/pixmaps/gnumeric/chart_surface_2_2.png
+share/gnome/pixmaps/gnumeric/diag_border
 share/gnome/pixmaps/gnumeric/down-right.png
+share/gnome/pixmaps/gnumeric/gp_125grey
+share/gnome/pixmaps/gnumeric/gp_25grey
+share/gnome/pixmaps/gnumeric/gp_50grey
+share/gnome/pixmaps/gnumeric/gp_625grey
+share/gnome/pixmaps/gnumeric/gp_75grey
+share/gnome/pixmaps/gnumeric/gp_diag
+share/gnome/pixmaps/gnumeric/gp_diag_cross
+share/gnome/pixmaps/gnumeric/gp_horiz
+share/gnome/pixmaps/gnumeric/gp_rev_diag
+share/gnome/pixmaps/gnumeric/gp_solid
+share/gnome/pixmaps/gnumeric/gp_thick_diag_cross
+share/gnome/pixmaps/gnumeric/gp_thin_diag
+share/gnome/pixmaps/gnumeric/gp_thin_diag_cross
+share/gnome/pixmaps/gnumeric/gp_thin_horiz
+share/gnome/pixmaps/gnumeric/gp_thin_horiz_cross
+share/gnome/pixmaps/gnumeric/gp_thin_rev_diag
+share/gnome/pixmaps/gnumeric/gp_thin_vert
+share/gnome/pixmaps/gnumeric/gp_vert
+share/gnome/pixmaps/gnumeric/inside_border
+share/gnome/pixmaps/gnumeric/inside_horiz_border
+share/gnome/pixmaps/gnumeric/inside_vert_border
+share/gnome/pixmaps/gnumeric/left_border
+share/gnome/pixmaps/gnumeric/line_pattern_dash_dot
+share/gnome/pixmaps/gnumeric/line_pattern_dash_dot_dot
+share/gnome/pixmaps/gnumeric/line_pattern_dashed
+share/gnome/pixmaps/gnumeric/line_pattern_dotted
+share/gnome/pixmaps/gnumeric/line_pattern_double
+share/gnome/pixmaps/gnumeric/line_pattern_hair
+share/gnome/pixmaps/gnumeric/line_pattern_medium
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash_dot
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash_dot_dot
+share/gnome/pixmaps/gnumeric/line_pattern_slant
+share/gnome/pixmaps/gnumeric/line_pattern_thick
+share/gnome/pixmaps/gnumeric/line_pattern_thin
+share/gnome/pixmaps/gnumeric/no_border
 share/gnome/pixmaps/gnumeric/orient-horizontal.png
 share/gnome/pixmaps/gnumeric/orient-vertical.png
+share/gnome/pixmaps/gnumeric/outline_border
+share/gnome/pixmaps/gnumeric/rev_diag_border
 share/gnome/pixmaps/gnumeric/right-down.png
+share/gnome/pixmaps/gnumeric/right_border
+share/gnome/pixmaps/gnumeric/top_border
 share/locale/cs/LC_MESSAGES/gnumeric.mo
 share/locale/da/LC_MESSAGES/gnumeric.mo
 share/locale/de/LC_MESSAGES/gnumeric.mo
@@ -136,9 +180,8 @@ share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
-@dirrm share/gnome/pixmaps/gnumeric
-@dirrm share/gnome/gnumeric/python
-@dirrm share/gnome/gnumeric/plugins
-@dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/glade
+@dirrm share/gnome/gnumeric/plugins
+@dirrm share/gnome/gnumeric/python
 @dirrm share/gnome/gnumeric
+@dirrm share/gnome/pixmaps/gnumeric
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 04d6fcc76b38..682476847ca6 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.41
+# Version required:			0.44
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnumeric-0.41
+DISTNAME=	gnumeric-0.44
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnumeric
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 51e131c54af0..7f432238dc32 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.41.tar.gz) = 1b03122ce3755c1841434b6723355670
+MD5 (gnumeric-0.44.tar.gz) = 403492503ca0f9be56d676cc0a728514
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index adac3612390f..5fa40f195778 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Oct 19 09:12:29 1999
-+++ configure	Wed Oct 20 11:59:28 1999
-@@ -2788,7 +2788,7 @@
+--- configure.orig	Fri Nov 19 15:59:10 1999
++++ configure	Sat Nov 27 14:06:34 1999
+@@ -2790,7 +2790,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -9,25 +9,25 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3333,7 +3333,7 @@
+@@ -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 3339 "configure"
+ #line 3341 "configure"
  #include "confdefs.h"
-@@ -3364,7 +3364,7 @@
+@@ -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
-@@ -5600,15 +5600,15 @@
+@@ -5602,15 +5602,15 @@
  fi
  
          
@@ -47,19 +47,19 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6056,7 +6056,7 @@
- echo "configure:6057: checking for GnomePrint libraries" >&5
+@@ -6110,7 +6110,7 @@
+ echo "configure:6111: checking for GnomePrint libraries" >&5
  if gnome-config --libs print > /dev/null 2>&1; then 
      echo "$ac_t""found" 1>&6
 -    . `gnome-config --libdir`/printConf.sh
 +    . `gnome-config --sysconfdir`/printConf.sh
      echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6
- echo "configure:6062: checking for GnomePrint >= 0.8" >&5
+ echo "configure:6116: checking for GnomePrint >= 0.8" >&5
      case x$MODULE_VERSION in
-@@ -6071,14 +6071,14 @@
+@@ -6125,14 +6125,14 @@
  
  echo $ac_n "checking for Glade libraries""... $ac_c" 1>&6
- echo "configure:6074: checking for Glade libraries" >&5
+ echo "configure:6128: checking for Glade libraries" >&5
 -if gnome-config --libs libglade > /dev/null 2>&1; then 
 +if libglade-config --libs > /dev/null 2>&1; then 
      echo "$ac_t""found" 1>&6
@@ -67,10 +67,10 @@
      { echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; }
  fi
  
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo`
-+EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print $bonobo` `libglade-config --libs gnome`"
-+EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print $bonobo` `libglade-config --cflags gnome`"
+-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/pkg-plist b/math/gnumeric2/pkg-plist
index 83dd53dc9ba3..668abc136d27 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,6 +1,8 @@
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
 share/gnome/apps/Applications/gnumeric.desktop
+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-zoom.glade
@@ -13,13 +15,13 @@ share/gnome/gnumeric/glade/print.glade
 share/gnome/gnumeric/glade/row-height.glade
 share/gnome/gnumeric/glade/sheet-rename.glade
 share/gnome/gnumeric/glade/summary.glade
-share/gnome/gnumeric/guile/gnumeric_startup.scm
 share/gnome/gnumeric/plugins/libcsv.so
-share/gnome/gnumeric/plugins/libgnumguile.so
 share/gnome/gnumeric/plugins/libhtml.so
 share/gnome/gnumeric/plugins/liblotus.so
+share/gnome/gnumeric/plugins/liboleo.so
 share/gnome/gnumeric/plugins/libpython.so
 share/gnome/gnumeric/plugins/libstat.so
+share/gnome/gnumeric/plugins/libsylk.so
 share/gnome/gnumeric/plugins/libtext.so
 share/gnome/gnumeric/plugins/libxbase.so
 share/gnome/gnumeric/python/gnumeric_startup.py
@@ -30,6 +32,7 @@ share/gnome/mime-info/gnumeric.keys
 share/gnome/mime-info/gnumeric.mime
 share/gnome/pixmaps/gnome-gnumeric-xl.png
 share/gnome/pixmaps/gnome-gnumeric.png
+share/gnome/pixmaps/gnumeric/bottom_border
 share/gnome/pixmaps/gnumeric/chart_area_1_1.png
 share/gnome/pixmaps/gnumeric/chart_area_1_2.png
 share/gnome/pixmaps/gnumeric/chart_area_1_3.png
@@ -103,10 +106,51 @@ share/gnome/pixmaps/gnumeric/chart_surface_1_1.png
 share/gnome/pixmaps/gnumeric/chart_surface_1_2.png
 share/gnome/pixmaps/gnumeric/chart_surface_2_1.png
 share/gnome/pixmaps/gnumeric/chart_surface_2_2.png
+share/gnome/pixmaps/gnumeric/diag_border
 share/gnome/pixmaps/gnumeric/down-right.png
+share/gnome/pixmaps/gnumeric/gp_125grey
+share/gnome/pixmaps/gnumeric/gp_25grey
+share/gnome/pixmaps/gnumeric/gp_50grey
+share/gnome/pixmaps/gnumeric/gp_625grey
+share/gnome/pixmaps/gnumeric/gp_75grey
+share/gnome/pixmaps/gnumeric/gp_diag
+share/gnome/pixmaps/gnumeric/gp_diag_cross
+share/gnome/pixmaps/gnumeric/gp_horiz
+share/gnome/pixmaps/gnumeric/gp_rev_diag
+share/gnome/pixmaps/gnumeric/gp_solid
+share/gnome/pixmaps/gnumeric/gp_thick_diag_cross
+share/gnome/pixmaps/gnumeric/gp_thin_diag
+share/gnome/pixmaps/gnumeric/gp_thin_diag_cross
+share/gnome/pixmaps/gnumeric/gp_thin_horiz
+share/gnome/pixmaps/gnumeric/gp_thin_horiz_cross
+share/gnome/pixmaps/gnumeric/gp_thin_rev_diag
+share/gnome/pixmaps/gnumeric/gp_thin_vert
+share/gnome/pixmaps/gnumeric/gp_vert
+share/gnome/pixmaps/gnumeric/inside_border
+share/gnome/pixmaps/gnumeric/inside_horiz_border
+share/gnome/pixmaps/gnumeric/inside_vert_border
+share/gnome/pixmaps/gnumeric/left_border
+share/gnome/pixmaps/gnumeric/line_pattern_dash_dot
+share/gnome/pixmaps/gnumeric/line_pattern_dash_dot_dot
+share/gnome/pixmaps/gnumeric/line_pattern_dashed
+share/gnome/pixmaps/gnumeric/line_pattern_dotted
+share/gnome/pixmaps/gnumeric/line_pattern_double
+share/gnome/pixmaps/gnumeric/line_pattern_hair
+share/gnome/pixmaps/gnumeric/line_pattern_medium
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash_dot
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash_dot_dot
+share/gnome/pixmaps/gnumeric/line_pattern_slant
+share/gnome/pixmaps/gnumeric/line_pattern_thick
+share/gnome/pixmaps/gnumeric/line_pattern_thin
+share/gnome/pixmaps/gnumeric/no_border
 share/gnome/pixmaps/gnumeric/orient-horizontal.png
 share/gnome/pixmaps/gnumeric/orient-vertical.png
+share/gnome/pixmaps/gnumeric/outline_border
+share/gnome/pixmaps/gnumeric/rev_diag_border
 share/gnome/pixmaps/gnumeric/right-down.png
+share/gnome/pixmaps/gnumeric/right_border
+share/gnome/pixmaps/gnumeric/top_border
 share/locale/cs/LC_MESSAGES/gnumeric.mo
 share/locale/da/LC_MESSAGES/gnumeric.mo
 share/locale/de/LC_MESSAGES/gnumeric.mo
@@ -136,9 +180,8 @@ share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
-@dirrm share/gnome/pixmaps/gnumeric
-@dirrm share/gnome/gnumeric/python
-@dirrm share/gnome/gnumeric/plugins
-@dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/glade
+@dirrm share/gnome/gnumeric/plugins
+@dirrm share/gnome/gnumeric/python
 @dirrm share/gnome/gnumeric
+@dirrm share/gnome/pixmaps/gnumeric