Update to version 0.26.

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

4 files changed, 33 insertions, 36 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 8f106fe993da..9c3671c224f0 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.25
+# Version required:			0.26
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.10 1999/04/08 18:08:34 steve Exp $
+# $Id: Makefile,v 1.11 1999/05/09 17:22:27 steve Exp $
 #
 
-DISTNAME=	gnumeric-0.25
+DISTNAME=	gnumeric-0.26
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnumeric
@@ -19,20 +19,16 @@ RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
 		python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	xml.0:${PORTSDIR}/textproc/libxml
 
-# implicit dependencies:
-# gettext, xpm, gtk12, guile, gnomelibs
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE} --with-guile
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX} --with-guile
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 0703738941ae..bb56a8e290ae 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.25.tar.gz) = 429e8afdf9a5bf0509307ae229034907
+MD5 (gnumeric-0.26.tar.gz) = 67cf0ef52a3fb6081c1c70613cea1648
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index c8d972afdef9..c24f8ceae6d7 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,15 +1,24 @@
---- configure.orig	Tue Apr 27 14:23:58 1999
-+++ configure	Thu May  6 10:48:39 1999
-@@ -3335,7 +3335,7 @@
+--- configure.orig	Tue May 18 18:00:05 1999
++++ configure	Sat May 22 15:59:03 1999
+@@ -2860,7 +2860,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -3405,7 +3405,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"
+ #line 3411 "configure"
  #include "confdefs.h"
-@@ -3366,7 +3366,7 @@
+@@ -3436,7 +3436,7 @@
    
  		
  		
@@ -18,7 +27,7 @@
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5583,15 +5583,15 @@
+@@ -5657,15 +5657,15 @@
  fi
  
          
@@ -28,19 +37,17 @@
          INSTOBJEXT=.mo
          DATADIRNAME=share
 -	INTLDEPS='$(top_builddir)/intl/libintl.a'
--	INTLLIBS=$INTLDEPS
--	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++	INTLDEPS='-lintl'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 -        nls_cv_header_intl=intl/libintl.h
 -        nls_cv_header_libgt=intl/libgettext.h
-+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+#	INTLLIBS=$INTLDEPS
-+#	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 +#        nls_cv_header_intl=intl/libintl.h
 +#        nls_cv_header_libgt=intl/libgettext.h
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6174,7 +6174,7 @@
+@@ -6249,7 +6249,7 @@
  test -n "$AWK" && break
  done
  
@@ -49,7 +56,7 @@
  
  cat >> confdefs.h <<\EOF
  #define ENABLE_GNOME 1
-@@ -6198,8 +6198,8 @@
+@@ -6273,8 +6273,8 @@
    LIBGLADE_FULLDIST_TRUE='#'
    LIBGLADE_FULLDIST_FALSE=
  fi
@@ -59,4 +66,4 @@
 +XML_CFLAGS=`xml-config --cflags`
  
  
- 
+ if false; then
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 3bfcb9442f6a..3946d7b89ed7 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,28 +1,21 @@
 bin/gnumeric
-bin/gnumeric-corba
-bin/ole
-lib/libglade.a
+etc/CORBA/servers/gnumeric.gnorba
 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
 share/gnome/gnumeric/plugins/libgnumguile.so.0
 share/gnome/gnumeric/plugins/libpython.a
-share/gnome/gnumeric/plugins/libpython.la
 share/gnome/gnumeric/plugins/libpython.so
 share/gnome/gnumeric/plugins/libpython.so.0
 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
@@ -51,6 +44,7 @@ share/locale/no/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
 share/locale/ru/LC_MESSAGES/gnumeric.mo
+share/locale/sk/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/gnumeric/python
 @dirrm share/gnome/gnumeric/plugins
 @dirrm share/gnome/gnumeric/perl