Update to 1.3.92.

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

6 files changed, 80 insertions, 7 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 52114da1a..9c44e24bf 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.3.91
+PORTVERSION=	1.3.92
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
@@ -36,6 +36,13 @@ GCONF_SCHEMAS=	gnumeric-dialogs.schemas gnumeric-general.schemas \
 
 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
+.endif
+
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
 		src/tools/solver/lp_solve/commonlib.h \
@@ -56,4 +63,4 @@ post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index a19f1cf17..5c5560321 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnumeric-1.3.91.tar.bz2) = 9f5928c0aebd041b7b4de8098188f48a
-SIZE (gnome2/gnumeric-1.3.91.tar.bz2) = 16036101
+MD5 (gnome2/gnumeric-1.3.92.tar.bz2) = d5c1b7b6be6bc17851098b9e2edbed85
+SIZE (gnome2/gnumeric-1.3.92.tar.bz2) = 16104872
diff --git a/math/gnumeric2/files/extra-patch-plugins_Makefile.in b/math/gnumeric2/files/extra-patch-plugins_Makefile.in
new file mode 100644
index 000000000..30ca07376
--- /dev/null
+++ b/math/gnumeric2/files/extra-patch-plugins_Makefile.in
@@ -0,0 +1,21 @@
+--- plugins/Makefile.in.orig	Mon Nov  1 23:32:23 2004
++++ plugins/Makefile.in	Mon Nov  1 23:33:19 2004
+@@ -322,15 +322,15 @@
+ SUBDIRS_FUNCTIONS = numtheory fn-database fn-date fn-eng fn-erlang fn-financial fn-info \
+ 	fn-logical fn-complex fn-lookup fn-math fn-stat fn-string fn-random \
+ 	derivatives \
+-	$(PERL_DIR) $(GUILE_DIR) \
++	$(GUILE_DIR) \
+ 	$(GDA_DIR) $(GNOMEDB_DIR)
+ 
+ 
+-SUBDIRS_LOADERS = $(PERL_LOADER_DIR) $(PYTHON_LOADER_DIR) $(CORBA_DIR)
++SUBDIRS_LOADERS = $(PYTHON_LOADER_DIR) $(CORBA_DIR)
+ 
+ SUBDIRS_DATA_SOURCES = sample_datasource
+ 
+-SUBDIRS_EXAMPLES = $(GNOME_GLOSSARY_DIR) $(PERL_FUNC_DIR) $(PYFUNC_DIR) uihello
++SUBDIRS_EXAMPLES = $(GNOME_GLOSSARY_DIR) $(PYFUNC_DIR) uihello
+ @PLUGIN_LIST_GIVEN_FALSE@SUBDIRS = $(SUBDIRS_FILE_FORMATS) $(SUBDIRS_FUNCTIONS) $(SUBDIRS_LOADERS) $(SUBDIRS_DATA_SOURCES) $(SUBDIRS_EXAMPLES)
+ 
+ @PLUGIN_LIST_GIVEN_TRUE@SUBDIRS = @PLUGIN_LIST@
diff --git a/math/gnumeric2/files/patch-configure b/math/gnumeric2/files/patch-configure
index e935dad17..c310853f4 100644
--- a/math/gnumeric2/files/patch-configure
+++ b/math/gnumeric2/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig	Wed Dec 24 13:17:48 2003
-+++ configure	Wed Dec 24 13:17:48 2003
-@@ -25411,7 +25412,7 @@
+--- configure.orig	Mon Nov  1 23:57:51 2004
++++ configure	Tue Nov  2 00:04:09 2004
+@@ -26725,9 +26725,6 @@
+ if test "${ac_cv_prog_python_val+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$python_val"; then
+-  ac_cv_prog_python_val="$python_val" # Let the user override the test.
+-else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+@@ -26743,7 +26740,6 @@
+ done
+ 
+ fi
+-fi
+ python_val=$ac_cv_prog_python_val
+ if test -n "$python_val"; then
+   echo "$as_me:$LINENO: result: $python_val" >&5
+@@ -27124,7 +27120,7 @@
  }'
  fi
  
diff --git a/math/gnumeric2/files/patch-templates_autoformat_Makefile.in b/math/gnumeric2/files/patch-templates_autoformat_Makefile.in
new file mode 100644
index 000000000..4fe70cfdd
--- /dev/null
+++ b/math/gnumeric2/files/patch-templates_autoformat_Makefile.in
@@ -0,0 +1,20 @@
+--- templates/autoformat/Makefile.in.orig	Mon Nov  1 23:52:27 2004
++++ templates/autoformat/Makefile.in	Mon Nov  1 23:53:49 2004
+@@ -464,13 +464,15 @@
+ 		    < $(srcdir)/$$cat.category.in			\
+ 		    > $$dir/.category 	;				\
+ 		for f in $(srcdir)/autoformat.$$cat.*.xml.in ; do	\
+-			echo "	$${f/.*autoformat.$$cat./}" ;		\
++			f1=`echo $${f} | sed -e 's/.*autoformat.$$cat.//'`; \
++			f2=`echo $${f} | sed -e 's/.xml.in/.xml/'`;	\
++			echo "	$${f1}" ;				\
+ 			sed 						\
+ 				-e 's/ _author *=/ author=/'		\
+ 				-e 's/ _name *=/ name=/' 		\
+ 				-e 's/ _description *=/ description=/'	\
+ 			    < $$f 					\
+-			    > $$dir/`basename $${f/.xml.in/.xml}` ;	\
++			    > $$dir/`basename $${f2}` ;			\
+ 		done							\
+ 	done
+ 
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index a31999c71..8ef1aba25 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -19,6 +19,8 @@ lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-erlang/erlang.so
+lib/gnumeric/%%VERSION%%/plugins/fn-erlang/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.so
@@ -89,6 +91,9 @@ lib/gnumeric/%%VERSION%%/plugins/sc/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/sc/sc.so
 lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so
+lib/gnumeric/%%VERSION%%/plugins/uihello/hello.xml
+lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.so
+lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
 lib/gnumeric/%%VERSION%%/plugins/xml_sax/plugin.xml
@@ -767,6 +772,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/gnumeric
 @dirrm lib/gnumeric/%%VERSION%%/plugins/xml_sax
 @dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
+@dirrm lib/gnumeric/%%VERSION%%/plugins/uihello
 @dirrm lib/gnumeric/%%VERSION%%/plugins/sylk
 @dirrm lib/gnumeric/%%VERSION%%/plugins/sc
 @dirrm lib/gnumeric/%%VERSION%%/plugins/sample_datasource
@@ -795,6 +801,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-logical
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-info
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-financial
+@dirrm lib/gnumeric/%%VERSION%%/plugins/fn-erlang
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-eng
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-date
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-database