PR: ports/14303

Submitted by:Ade Lovett<ade@lovett.com>
Update to 0.38

4 files changed, 115 insertions, 22 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index ce8d84dc0dc5..8091fb846f50 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,28 +1,30 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.31
+# Version required:			0.38
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnumeric-0.31
+DISTNAME=	gnumeric-0.38
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnumeric
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	glade.1:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	gnomeprint.2:${PORTSDIR}/print/gnomeprint \
+		glade.2:${PORTSDIR}/devel/libglade
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-USE_X_PREFIX=	yes
 USE_PERL5=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index e11972da3623..427c7f2f7515 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.31.tar.gz) = 66940913e2d318028a406f577402e028
+MD5 (gnumeric-0.38.tar.gz) = 9b257aa529abac086d4ef1c9825522a2
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index c454c52d5284..91e567e3aa76 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Fri Jul  9 22:12:23 1999
-+++ configure	Mon Jul 12 16:48:09 1999
-@@ -2786,7 +2786,7 @@
+--- configure.orig	Thu Sep 23 17:49:58 1999
++++ configure	Fri Sep 24 15:00:53 1999
+@@ -2788,7 +2788,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
-@@ -3356,7 +3356,7 @@
+@@ -3333,7 +3333,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
--LIBS="-lxml `gnome-config --libs xml` $LIBS"
+-LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
 +LIBS="`xml-config --libs` $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 3362 "configure"
+ #line 3339 "configure"
  #include "confdefs.h"
-@@ -3387,7 +3387,7 @@
+@@ -3364,7 +3364,7 @@
    
  		
  		
--		GNOME_XML_LIB=`gnome-config --libs xml`
+-		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
 +		GNOME_XML_LIB=`xml-config --libs`
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5616,15 +5616,15 @@
+@@ -5593,15 +5593,15 @@
  fi
  
          
@@ -42,15 +42,24 @@
  	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 -        nls_cv_header_intl=intl/libintl.h
 -        nls_cv_header_libgt=intl/libgettext.h
-+#       nls_cv_header_intl=intl/libintl.h
-+#       nls_cv_header_libgt=intl/libgettext.h
++#        nls_cv_header_intl=intl/libintl.h
++#        nls_cv_header_libgt=intl/libgettext.h
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6053,14 +6053,14 @@
+@@ -6037,7 +6037,7 @@
+ echo "configure:6038: 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:6043: checking for GnomePrint >= 0.8" >&5
+     case x$MODULE_VERSION in
+@@ -6052,14 +6052,14 @@
  
- echo $ac_n "checking For Glade libraries""... $ac_c" 1>&6
- echo "configure:6056: checking For Glade libraries" >&5
+ echo $ac_n "checking for Glade libraries""... $ac_c" 1>&6
+ echo "configure:6055: 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
@@ -60,8 +69,8 @@
  
 -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` `libglade-config --libs gnome` $bonobo"
-+EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print` `libglade-config --cflags gnome` $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`"
  
  
  
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 6e1c727c4616..8531e6500a81 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,14 +1,21 @@
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
 share/gnome/apps/Applications/gnumeric.desktop
+share/gnome/gnumeric/glade/col-width.glade
+share/gnome/gnumeric/glade/dialog-zoom.glade
 share/gnome/gnumeric/glade/font-sel.glade
 share/gnome/gnumeric/glade/hf-config.glade
 share/gnome/gnumeric/glade/import.glade
+share/gnome/gnumeric/glade/names.glade
 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/libpython.so
 share/gnome/gnumeric/plugins/libstat.so
 share/gnome/gnumeric/plugins/libtext.so
@@ -20,11 +27,85 @@ 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/chart_area_1_1.png
+share/gnome/pixmaps/gnumeric/chart_area_1_2.png
+share/gnome/pixmaps/gnumeric/chart_area_1_3.png
+share/gnome/pixmaps/gnumeric/chart_area_2_1.png
+share/gnome/pixmaps/gnumeric/chart_area_2_2.png
+share/gnome/pixmaps/gnumeric/chart_area_2_3.png
+share/gnome/pixmaps/gnumeric/chart_bar_1_1.png
+share/gnome/pixmaps/gnumeric/chart_bar_1_2.png
+share/gnome/pixmaps/gnumeric/chart_bar_1_3.png
+share/gnome/pixmaps/gnumeric/chart_bar_2_1_.png
+share/gnome/pixmaps/gnumeric/chart_bar_2_2_.png
+share/gnome/pixmaps/gnumeric/chart_bar_2_3_.png
+share/gnome/pixmaps/gnumeric/chart_bubble_1_1.png
+share/gnome/pixmaps/gnumeric/chart_bubble_1_2.png
+share/gnome/pixmaps/gnumeric/chart_column_1_1.png
+share/gnome/pixmaps/gnumeric/chart_column_1_2.png
+share/gnome/pixmaps/gnumeric/chart_column_1_3.png
+share/gnome/pixmaps/gnumeric/chart_column_2_1.png
+share/gnome/pixmaps/gnumeric/chart_column_2_2.png
+share/gnome/pixmaps/gnumeric/chart_column_2_3.png
+share/gnome/pixmaps/gnumeric/chart_column_3_1.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_1_1.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_1_2.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_1_3.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_2_1.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_2_2.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_2_3.png
+share/gnome/pixmaps/gnumeric/chart_cone.xpm_3_1.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_1_1.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_1_2.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_1_3.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_2_1.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_2_2.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_2_3.png
+share/gnome/pixmaps/gnumeric/chart_cylinder_3_1.png
+share/gnome/pixmaps/gnumeric/chart_doghnut_1_1.png
+share/gnome/pixmaps/gnumeric/chart_doghnut_2_1.png
+share/gnome/pixmaps/gnumeric/chart_line_1_1.png
+share/gnome/pixmaps/gnumeric/chart_line_1_2.png
+share/gnome/pixmaps/gnumeric/chart_line_1_3.png
+share/gnome/pixmaps/gnumeric/chart_line_2_1.png
+share/gnome/pixmaps/gnumeric/chart_line_2_2.png
+share/gnome/pixmaps/gnumeric/chart_line_2_3.png
+share/gnome/pixmaps/gnumeric/chart_line_3_1.png
+share/gnome/pixmaps/gnumeric/chart_pie_1_1.png
+share/gnome/pixmaps/gnumeric/chart_pie_1_2.png
+share/gnome/pixmaps/gnumeric/chart_pie_1_3.png
+share/gnome/pixmaps/gnumeric/chart_pie_2_1.png
+share/gnome/pixmaps/gnumeric/chart_pie_2_2.png
+share/gnome/pixmaps/gnumeric/chart_pie_2_3.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_1_1.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_1_2.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_1_3.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_2_1.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_2_2.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_2_3.png
+share/gnome/pixmaps/gnumeric/chart_pyramid_3_1.png
+share/gnome/pixmaps/gnumeric/chart_radar_1_1.png
+share/gnome/pixmaps/gnumeric/chart_radar_1_2.png
+share/gnome/pixmaps/gnumeric/chart_radar_1_3.png
+share/gnome/pixmaps/gnumeric/chart_scatter_1_1.png
+share/gnome/pixmaps/gnumeric/chart_scatter_2_1.png
+share/gnome/pixmaps/gnumeric/chart_scatter_2_2.png
+share/gnome/pixmaps/gnumeric/chart_scatter_3_1.png
+share/gnome/pixmaps/gnumeric/chart_scatter_3_2.png
+share/gnome/pixmaps/gnumeric/chart_stock_1_1.png
+share/gnome/pixmaps/gnumeric/chart_stock_1_2.png
+share/gnome/pixmaps/gnumeric/chart_stock_2_1.png
+share/gnome/pixmaps/gnumeric/chart_stock_2_2.png
+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/down-right.png
 share/gnome/pixmaps/gnumeric/orient-horizontal.png
 share/gnome/pixmaps/gnumeric/orient-vertical.png
 share/gnome/pixmaps/gnumeric/right-down.png
 share/locale/cs/LC_MESSAGES/gnumeric.mo
+share/locale/da/LC_MESSAGES/gnumeric.mo
 share/locale/de/LC_MESSAGES/gnumeric.mo
 share/locale/en_GB/LC_MESSAGES/gnumeric.mo
 share/locale/es/LC_MESSAGES/gnumeric.mo
@@ -45,6 +126,7 @@ share/locale/ko/LC_MESSAGES/gnumeric.mo
 share/locale/no/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
+share/locale/pt_BR/LC_MESSAGES/gnumeric.mo
 share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo