6 files changed, 25 insertions, 23 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index fd5c1163bf46..955c000d30fc 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -34,6 +34,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 GCONF_SCHEMAS=	gnumeric-dialogs.schemas gnumeric-general.schemas \
 		gnumeric-plugins.schemas
 
+MAN1=		gnumeric.1 ssconvert.1
+
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 7196294918a6..3700c6ff3ce4 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnumeric-1.4.1.tar.bz2) = bc60b5c342908e969b320ab833e6b151
-SIZE (gnome2/gnumeric-1.4.1.tar.bz2) = 16827174
+MD5 (gnome2/gnumeric-1.4.2.tar.bz2) = 095167b8f123b3cf4bf76111a9a2cd1e
+SIZE (gnome2/gnumeric-1.4.2.tar.bz2) = 16914595
diff --git a/math/gnumeric/files/patch-doc_C_Makefile.in b/math/gnumeric/files/patch-doc_C_Makefile.in
new file mode 100644
index 000000000000..ebfc186f993f
--- /dev/null
+++ b/math/gnumeric/files/patch-doc_C_Makefile.in
@@ -0,0 +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 @@
+ omf_dest_dir = $(datadir)/omf/@PACKAGE@
+ scrollkeeper_localstate_dir = /var/db/scrollkeeper
+ 
+-manpagedir = $(datadir)/man/man1
++manpagedir = $(mandir)/man1
+ manpage_DATA = gnumeric.1 ssconvert.1
+ subdir = doc/C
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c b/math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c
new file mode 100644
index 000000000000..64f9f0c07baa
--- /dev/null
+++ b/math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c
@@ -0,0 +1,8 @@
+--- src/tools/solver/lp_solve/commonlib.c.orig	Tue Jan 18 00:16:36 2005
++++ src/tools/solver/lp_solve/commonlib.c	Tue Jan 18 00:19:24 2005
+@@ -1,4 +1,5 @@
+ 
++#include <gnumeric-config.h>
+ #include <sys/types.h>
+ 
+ #ifdef INTEGERTIME
diff --git a/math/gnumeric/files/patch-templates_autoformat_Makefile.in b/math/gnumeric/files/patch-templates_autoformat_Makefile.in
deleted file mode 100644
index 4fe70cfdd407..000000000000
--- a/math/gnumeric/files/patch-templates_autoformat_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 5592883422c4..9cac177430b4 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -652,6 +652,7 @@ share/gnome/pixmaps/gnumeric/chart_cone_2_1.png
 share/gnome/pixmaps/gnumeric/chart_cone_2_2.png
 share/gnome/pixmaps/gnumeric/chart_cone_2_3.png
 share/gnome/pixmaps/gnumeric/chart_cone_3_1.png
+share/gnome/pixmaps/gnumeric/chart_contour_1_1.png
 share/gnome/pixmaps/gnumeric/chart_cylinder_1_1.png
 share/gnome/pixmaps/gnumeric/chart_cylinder_1_2.png
 share/gnome/pixmaps/gnumeric/chart_cylinder_1_3.png