Update to 0.53

5 files changed, 81 insertions, 89 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index baa5a5080a4e..51903614da69 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 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.7:${PORTSDIR}/print/gnomeprint \
+LIB_DEPENDS=	gnomeprint.9:${PORTSDIR}/print/gnomeprint \
 		glade.3:${PORTSDIR}/devel/libglade
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -33,6 +33,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	GNUMERIC_REV=${DISTNAME:S/gnumeric-//g}
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 047fa6c72e2e..b521d0765647 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.52.tar.gz) = 15012c28f9490b7d6f83cb4c68bc221b
+MD5 (gnumeric-0.53.tar.gz) = 775b2b8ad8c4192bf50b3bdc03292e85
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 0b9b4982aec6..847f32305e73 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,38 +1,9 @@
---- configure.orig	Wed Apr 12 20:43:02 2000
-+++ configure	Mon Apr 17 17:54:44 2000
-@@ -2507,7 +2507,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
-@@ -5319,15 +5319,15 @@
- fi
- 
-         
--	USE_INCLUDED_LIBINTL=yes
-+#	USE_INCLUDED_LIBINTL=yes
-         CATOBJEXT=.gmo
-         INSTOBJEXT=.mo
-         DATADIRNAME=share
- 	INTLDEPS='$(top_builddir)/intl/libintl.a'
--	INTLLIBS=$INTLDEPS
-+	INTLLIBS='-lintl'
- 	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
-       fi
- 
-             if test "$XGETTEXT" != ":"; then
-@@ -5876,8 +5876,8 @@
+--- configure.orig	Tue May  9 20:50:13 2000
++++ configure	Tue May 16 09:56:35 2000
+@@ -5951,8 +5951,8 @@
  
  echo $ac_n "checking for GTK >= 1.2.7""... $ac_c" 1>&6
- echo "configure:5879: checking for GTK >= 1.2.7" >&5
+ echo "configure:5954: checking for GTK >= 1.2.7" >&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 
diff --git a/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba
index cd1807b2624a..bceb783e7ea2 100644
--- a/math/gnumeric2/files/patch-ba
+++ b/math/gnumeric2/files/patch-ba
@@ -1,15 +1,21 @@
---- Makefile.in.orig	Sun Mar 26 22:20:39 2000
-+++ Makefile.in	Mon Mar 27 12:04:17 2000
-@@ -146,7 +146,7 @@
+--- Makefile.in.orig	Tue May  9 21:57:18 2000
++++ Makefile.in	Tue May 16 12:16:37 2000
+@@ -152,12 +152,12 @@
  perl_val = @perl_val@
  python_val = @python_val@
  
--SUBDIRS = intl po macros idl plugins wizards src graph doc icons
-+SUBDIRS = intl po macros idl plugins wizards src graph icons
+-SUBDIRS = . intl po macros idl plugins wizards src graph doc icons
++SUBDIRS = . intl po macros idl plugins wizards src graph icons
  
  change_logs =  	OOChangeLog OChangeLog ChangeLog
  
-@@ -158,7 +158,7 @@
+ 
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = gnumericConf.sh
+ 
+ CLEANFILES = gnumericConf.sh
+@@ -169,7 +169,7 @@
  appicon_DATA = gnome-gnumeric.png                gnome-application-x-gnumeric.png                gnome-application-x-xls.png
  
  
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index d27d5716dfc3..b11bbfed5442 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,53 +1,58 @@
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
 etc/CORBA/servers/graph.gnorba
+etc/gnumericConf.sh
+lib/gnumeric/%%VERSION%%/plugins/gnum_csv.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_dif.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_guile.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_html.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_lotus.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_numtheory.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_oleo.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_sc.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_sylk.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_text.so
+lib/gnumeric/%%VERSION%%/plugins/gnum_xbase.so
 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
-share/gnome/gnumeric/glade/autosave.glade
-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/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
-share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_dif.so
-share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_guile.so
-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_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/gnumeric/%%VERSION%%/glade/advanced-filter.glade
+share/gnome/gnumeric/%%VERSION%%/glade/analysis-tools.glade
+share/gnome/gnumeric/%%VERSION%%/glade/autocorrect-exceptions.glade
+share/gnome/gnumeric/%%VERSION%%/glade/autocorrect.glade
+share/gnome/gnumeric/%%VERSION%%/glade/autosave-prompt.glade
+share/gnome/gnumeric/%%VERSION%%/glade/autosave.glade
+share/gnome/gnumeric/%%VERSION%%/glade/cell-format.glade
+share/gnome/gnumeric/%%VERSION%%/glade/cell-sort.glade
+share/gnome/gnumeric/%%VERSION%%/glade/col-width.glade
+share/gnome/gnumeric/%%VERSION%%/glade/delete-cells.glade
+share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
+share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade
+share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
+share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade
+share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade
+share/gnome/gnumeric/%%VERSION%%/glade/graphics.glade
+share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade
+share/gnome/gnumeric/%%VERSION%%/glade/import.glade
+share/gnome/gnumeric/%%VERSION%%/glade/insert-cells.glade
+share/gnome/gnumeric/%%VERSION%%/glade/names.glade
+share/gnome/gnumeric/%%VERSION%%/glade/plugin-manager.glade
+share/gnome/gnumeric/%%VERSION%%/glade/print.glade
+share/gnome/gnumeric/%%VERSION%%/glade/row-height.glade
+share/gnome/gnumeric/%%VERSION%%/glade/sheet-order.glade
+share/gnome/gnumeric/%%VERSION%%/glade/sheet-rename.glade
+share/gnome/gnumeric/%%VERSION%%/glade/solver-options.glade
+share/gnome/gnumeric/%%VERSION%%/glade/solver.glade
+share/gnome/gnumeric/%%VERSION%%/glade/summary.glade
+share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade
+share/gnome/gnumeric/%%VERSION%%/guile/functions.scm
+share/gnome/gnumeric/%%VERSION%%/guile/gnumeric_startup.scm
+share/gnome/gnumeric/%%VERSION%%/python/gnumeric_defs.py
+share/gnome/gnumeric/%%VERSION%%/python/gnumeric_startup.py
 share/gnome/idl/Gnumeric.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/oaf/graph.oafinfo
 share/gnome/pixmaps/gnome-application-x-gnumeric.png
 share/gnome/pixmaps/gnome-application-x-xls.png
 share/gnome/pixmaps/gnome-gnumeric.png
@@ -132,11 +137,17 @@ 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_bricks
 share/gnome/pixmaps/gnumeric/gp_diag
 share/gnome/pixmaps/gnumeric/gp_diag_cross
+share/gnome/pixmaps/gnumeric/gp_foreground_solid
 share/gnome/pixmaps/gnumeric/gp_horiz
+share/gnome/pixmaps/gnumeric/gp_large_circles
 share/gnome/pixmaps/gnumeric/gp_rev_diag
+share/gnome/pixmaps/gnumeric/gp_semi_circle
+share/gnome/pixmaps/gnumeric/gp_small_circle
 share/gnome/pixmaps/gnumeric/gp_solid
+share/gnome/pixmaps/gnumeric/gp_thatch
 share/gnome/pixmaps/gnumeric/gp_thick_diag_cross
 share/gnome/pixmaps/gnumeric/gp_thin_diag
 share/gnome/pixmaps/gnumeric/gp_thin_diag_cross
@@ -169,6 +180,7 @@ 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/stf-druid.png
 share/gnome/pixmaps/gnumeric/top_border
 share/locale/cs/LC_MESSAGES/gnumeric.mo
 share/locale/da/LC_MESSAGES/gnumeric.mo
@@ -203,10 +215,13 @@ 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
-@dirrm share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/
-@dirrm share/gnome/gnumeric/plugins
-@dirrm share/gnome/gnumeric/python
+@dirrm share/gnome/gnumeric/%%VERSION%%/python
+@dirrm share/gnome/gnumeric/%%VERSION%%/guile
+@dirrm share/gnome/gnumeric/%%VERSION%%/glade
+@dirrm share/gnome/gnumeric/%%VERSION%%
 @dirrm share/gnome/gnumeric
 @dirrm share/gnome/pixmaps/gnumeric
+@dirrm share/gnome/oaf
+@dirrm lib/gnumeric/%%VERSION%%/plugins
+@dirrm lib/gnumeric/%%VERSION%%
+@dirrm lib/gnumeric