Update to 1.5.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4505 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 28 insertions, 26 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 31a78feef..c3dbec306 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.7 2005/07/01 18:03:12 marcus Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.8 2005/08/08 07:21:59 marcus Exp $
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTVERSION=	1.5.3
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -24,12 +23,12 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier libgnomeprintui \
-		libgsf_gnome pygtk2 desktopfileutils
+		libgsf_gnome pygtk2 desktopfileutils libgnomedb
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--without-guile --with-bonobo --without-gnome-db
+CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		python_prog=${PYTHON_VERSION}
@@ -44,8 +43,9 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-# The Perl plug-ins don't build with Perl < 5.6.1
-#EXTRA_PATCHES+=	${FILESDIR}/extra-patch-plugins_Makefile.in
+PLIST_SUB+=	PERL="@comment "
+.else
+PLIST_SUB+=	PERL=""
 .endif
 
 post-patch:
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 2f19f2187..ad5be5b07 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnumeric-1.5.2.tar.bz2) = 70051ecbd00a4b2d58ed51ca552fdf22
-SIZE (gnome2/gnumeric-1.5.2.tar.bz2) = 12028821
+MD5 (gnome2/gnumeric-1.5.3.tar.bz2) = 2b0496fc7ec3d407f3aebcc29b8e4b2b
+SIZE (gnome2/gnumeric-1.5.3.tar.bz2) = 12290411
diff --git a/math/gnumeric/files/patch-doc_C_Makefile.in b/math/gnumeric/files/patch-doc_C_Makefile.in
index ebfc186f9..4019754d1 100644
--- a/math/gnumeric/files/patch-doc_C_Makefile.in
+++ b/math/gnumeric/files/patch-doc_C_Makefile.in
@@ -1,11 +1,11 @@
---- doc/C/Makefile.in.orig	Tue Jan 18 00:42:51 2005
-+++ doc/C/Makefile.in	Tue Jan 18 00:43:05 2005
-@@ -449,7 +449,7 @@
+--- doc/C/Makefile.in.orig	Tue Aug 16 01:15:11 2005
++++ doc/C/Makefile.in	Tue Aug 16 01:16:17 2005
+@@ -421,7 +421,7 @@
+ CLEANFILES = omf_timestamp
  omf_dest_dir = $(datadir)/omf/@PACKAGE@
  scrollkeeper_localstate_dir = /var/db/scrollkeeper
- 
 -manpagedir = $(datadir)/man/man1
-+manpagedir = $(mandir)/man1
++manpagedir = $(prefix)/man/man1
  manpage_DATA = gnumeric.1 ssconvert.1
- subdir = doc/C
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ all: all-recursive
+ 
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index eb6985346..09980cd84 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -39,9 +39,9 @@ lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml
-@comment lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
-@comment lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
-@comment lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.so
+lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
+lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.so
 lib/gnumeric/%%VERSION%%/plugins/gnome-db/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/gnome-db/ui.xml
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
@@ -60,10 +60,10 @@ lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.so
 lib/gnumeric/%%VERSION%%/plugins/oleo/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/openoffice/openoffice.so
 lib/gnumeric/%%VERSION%%/plugins/openoffice/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/perl-func/perl_func.pl
-lib/gnumeric/%%VERSION%%/plugins/perl-func/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/perl-loader/perl_loader.so
-lib/gnumeric/%%VERSION%%/plugins/perl-loader/plugin.xml
+%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-func/perl_func.pl
+%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-func/plugin.xml
+%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/perl_loader.so
+%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.so
 lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
@@ -697,6 +697,8 @@ share/locale/sr@Latn/LC_MESSAGES/gnumeric-functions.mo
 share/locale/sr@Latn/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric-functions.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
+share/locale/te/LC_MESSAGES/gnumeric-functions.mo
+share/locale/te/LC_MESSAGES/gnumeric.mo
 share/locale/tr/LC_MESSAGES/gnumeric-functions.mo
 share/locale/tr/LC_MESSAGES/gnumeric.mo
 share/locale/uk/LC_MESSAGES/gnumeric-functions.mo
@@ -733,8 +735,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/python-loader
 @dirrm lib/gnumeric/%%VERSION%%/plugins/py-func
 @dirrm lib/gnumeric/%%VERSION%%/plugins/plan_perfect
-@dirrm lib/gnumeric/%%VERSION%%/plugins/perl-loader
-@dirrm lib/gnumeric/%%VERSION%%/plugins/perl-func
+%%PERL%%@dirrm lib/gnumeric/%%VERSION%%/plugins/perl-loader
+%%PERL%%@dirrm lib/gnumeric/%%VERSION%%/plugins/perl-func
 @dirrm lib/gnumeric/%%VERSION%%/plugins/openoffice
 @dirrm lib/gnumeric/%%VERSION%%/plugins/oleo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/numtheory
@@ -743,7 +745,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/html
 @dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-glossary
 @dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-db
-@comment @dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif
+@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-string
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-stat
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-random