Update to version 0.25.

PR:		11544
Submitted by:	Ade Lovett <ade@lovett.com>

10 files changed, 86 insertions, 24 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 2d3423f64fa1..8f106fe993da 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.18
+# Version required:			0.25
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/03/26 04:48:08 nectar Exp $
+# $Id: Makefile,v 1.10 1999/04/08 18:08:34 steve Exp $
 #
 
-DISTNAME=	gnumeric-0.18
+DISTNAME=	gnumeric-0.25
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnumeric
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 5bd49bf31e3c..0703738941ae 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.18.tar.gz) = 203c37c6f653df4cf2ca97569fba0277
+MD5 (gnumeric-0.25.tar.gz) = 429e8afdf9a5bf0509307ae229034907
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index 1c57a9bcda2d..c8d972afdef9 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,15 +1,15 @@
---- configure.orig	Wed Feb 24 03:49:18 1999
-+++ configure	Wed Feb 24 18:46:00 1999
-@@ -3309,7 +3309,7 @@
+--- configure.orig	Tue Apr 27 14:23:58 1999
++++ configure	Thu May  6 10:48:39 1999
+@@ -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 3315 "configure"
+ #line 3341 "configure"
  #include "confdefs.h"
-@@ -3340,7 +3340,7 @@
+@@ -3366,7 +3366,7 @@
    
  		
  		
@@ -18,7 +18,7 @@
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5557,15 +5557,15 @@
+@@ -5583,15 +5583,15 @@
  fi
  
          
@@ -40,3 +40,23 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
+@@ -6174,7 +6174,7 @@
+ test -n "$AWK" && break
+ done
+ 
+-GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h"
++GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gtk12/gdk/gdkkeysyms.h"
+ 
+ cat >> confdefs.h <<\EOF
+ #define ENABLE_GNOME 1
+@@ -6198,8 +6198,8 @@
+   LIBGLADE_FULLDIST_TRUE='#'
+   LIBGLADE_FULLDIST_FALSE=
+ fi
+-XML_LIBS=`gnome-config --libs xml`
+-XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml
++XML_LIBS=`xml-config --libs`
++XML_CFLAGS=`xml-config --cflags`
+ 
+ 
+ 
diff --git a/math/gnumeric/files/patch-ba b/math/gnumeric/files/patch-ba
index 3dff658d020c..6a7b72a8443b 100644
--- a/math/gnumeric/files/patch-ba
+++ b/math/gnumeric/files/patch-ba
@@ -4,8 +4,8 @@
  perl_val = @perl_val@
  python_val = @python_val@
  
--SUBDIRS = intl po macros plugins src doc
-+SUBDIRS = intl po macros plugins src
+-SUBDIRS = intl po macros libglade plugins src doc
++SUBDIRS = intl po macros libglade plugins src
  
  EXTRA_DIST =  	gnumeric.desktop README HACKING gnumeric.spec.in 	gnumeric.keys.in gnumeric.mime $(appicon_DATA)
  
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index cbaca5a75b5c..3bfcb9442f6a 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,8 +1,14 @@
 bin/gnumeric
 bin/gnumeric-corba
+bin/ole
+lib/libglade.a
 share/gnome/apps/Applications/gnumeric.desktop
 share/gnome/gnumeric/guile/gnumeric_startup.scm
 share/gnome/gnumeric/perl/startup.pl
+share/gnome/gnumeric/plugins/libcsv.a
+share/gnome/gnumeric/plugins/libcsv.la
+share/gnome/gnumeric/plugins/libcsv.so
+share/gnome/gnumeric/plugins/libcsv.so.0
 share/gnome/gnumeric/plugins/libgnumguile.a
 share/gnome/gnumeric/plugins/libgnumguile.la
 share/gnome/gnumeric/plugins/libgnumguile.so
@@ -15,6 +21,10 @@ share/gnome/gnumeric/plugins/libstat.a
 share/gnome/gnumeric/plugins/libstat.la
 share/gnome/gnumeric/plugins/libstat.so
 share/gnome/gnumeric/plugins/libstat.so.0
+share/gnome/gnumeric/plugins/libtext.a
+share/gnome/gnumeric/plugins/libtext.la
+share/gnome/gnumeric/plugins/libtext.so
+share/gnome/gnumeric/plugins/libtext.so.0
 share/gnome/gnumeric/python/gnumeric_startup.py
 share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
@@ -23,6 +33,7 @@ share/gnome/pixmaps/gnome-gnumeric-xl.png
 share/gnome/pixmaps/gnome-gnumeric.png
 share/locale/cs/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
 share/locale/es_DO/LC_MESSAGES/gnumeric.mo
 share/locale/es_GT/LC_MESSAGES/gnumeric.mo
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 2d3423f64fa1..8f106fe993da 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.18
+# Version required:			0.25
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.9 1999/03/26 04:48:08 nectar Exp $
+# $Id: Makefile,v 1.10 1999/04/08 18:08:34 steve Exp $
 #
 
-DISTNAME=	gnumeric-0.18
+DISTNAME=	gnumeric-0.25
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnumeric
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 5bd49bf31e3c..0703738941ae 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.18.tar.gz) = 203c37c6f653df4cf2ca97569fba0277
+MD5 (gnumeric-0.25.tar.gz) = 429e8afdf9a5bf0509307ae229034907
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 1c57a9bcda2d..c8d972afdef9 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,15 +1,15 @@
---- configure.orig	Wed Feb 24 03:49:18 1999
-+++ configure	Wed Feb 24 18:46:00 1999
-@@ -3309,7 +3309,7 @@
+--- configure.orig	Tue Apr 27 14:23:58 1999
++++ configure	Thu May  6 10:48:39 1999
+@@ -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 3315 "configure"
+ #line 3341 "configure"
  #include "confdefs.h"
-@@ -3340,7 +3340,7 @@
+@@ -3366,7 +3366,7 @@
    
  		
  		
@@ -18,7 +18,7 @@
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5557,15 +5557,15 @@
+@@ -5583,15 +5583,15 @@
  fi
  
          
@@ -40,3 +40,23 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
+@@ -6174,7 +6174,7 @@
+ test -n "$AWK" && break
+ done
+ 
+-GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h"
++GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gtk12/gdk/gdkkeysyms.h"
+ 
+ cat >> confdefs.h <<\EOF
+ #define ENABLE_GNOME 1
+@@ -6198,8 +6198,8 @@
+   LIBGLADE_FULLDIST_TRUE='#'
+   LIBGLADE_FULLDIST_FALSE=
+ fi
+-XML_LIBS=`gnome-config --libs xml`
+-XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml
++XML_LIBS=`xml-config --libs`
++XML_CFLAGS=`xml-config --cflags`
+ 
+ 
+ 
diff --git a/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba
index 3dff658d020c..6a7b72a8443b 100644
--- a/math/gnumeric2/files/patch-ba
+++ b/math/gnumeric2/files/patch-ba
@@ -4,8 +4,8 @@
  perl_val = @perl_val@
  python_val = @python_val@
  
--SUBDIRS = intl po macros plugins src doc
-+SUBDIRS = intl po macros plugins src
+-SUBDIRS = intl po macros libglade plugins src doc
++SUBDIRS = intl po macros libglade plugins src
  
  EXTRA_DIST =  	gnumeric.desktop README HACKING gnumeric.spec.in 	gnumeric.keys.in gnumeric.mime $(appicon_DATA)
  
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index cbaca5a75b5c..3bfcb9442f6a 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,8 +1,14 @@
 bin/gnumeric
 bin/gnumeric-corba
+bin/ole
+lib/libglade.a
 share/gnome/apps/Applications/gnumeric.desktop
 share/gnome/gnumeric/guile/gnumeric_startup.scm
 share/gnome/gnumeric/perl/startup.pl
+share/gnome/gnumeric/plugins/libcsv.a
+share/gnome/gnumeric/plugins/libcsv.la
+share/gnome/gnumeric/plugins/libcsv.so
+share/gnome/gnumeric/plugins/libcsv.so.0
 share/gnome/gnumeric/plugins/libgnumguile.a
 share/gnome/gnumeric/plugins/libgnumguile.la
 share/gnome/gnumeric/plugins/libgnumguile.so
@@ -15,6 +21,10 @@ share/gnome/gnumeric/plugins/libstat.a
 share/gnome/gnumeric/plugins/libstat.la
 share/gnome/gnumeric/plugins/libstat.so
 share/gnome/gnumeric/plugins/libstat.so.0
+share/gnome/gnumeric/plugins/libtext.a
+share/gnome/gnumeric/plugins/libtext.la
+share/gnome/gnumeric/plugins/libtext.so
+share/gnome/gnumeric/plugins/libtext.so.0
 share/gnome/gnumeric/python/gnumeric_startup.py
 share/gnome/mc/templates/gnumeric.desktop
 share/gnome/mime-info/gnumeric.keys
@@ -23,6 +33,7 @@ share/gnome/pixmaps/gnome-gnumeric-xl.png
 share/gnome/pixmaps/gnome-gnumeric.png
 share/locale/cs/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
 share/locale/es_DO/LC_MESSAGES/gnumeric.mo
 share/locale/es_GT/LC_MESSAGES/gnumeric.mo