Ypdate to 1.0.11.

5 files changed, 18 insertions, 39 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index cb3500652a3f..6f1537758ce6 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTVERSION=	1.0.11
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnumeric/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 6cfa3417c3c6..237e8d371292 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnome/gnumeric-1.0.10.tar.bz2) = c5b3bfd35da54e49341183845003b6ab
+MD5 (gnome/gnumeric-1.0.11.tar.bz2) = f93e4e6296e8c5fe60c3093b4869b589
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index 3bbcde722300..d182a0f6270f 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Jun  7 21:38:37 2002
-+++ configure	Fri Jun  7 21:39:48 2002
-@@ -5913,6 +5913,7 @@
+--- configure.orig	Thu Dec 12 14:44:07 2002
++++ configure	Tue Dec 24 00:22:37 2002
+@@ -9014,6 +9014,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10790,7 +10791,7 @@
+@@ -17878,7 +17879,7 @@
  	if gnome-config --libs gb > /dev/null 2>&1; then
  		verstxt=`gnome-config --modversion gb 2>/dev/null`
  		vers=`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 10000 + $2 * 100 + $3; }'`
 -		if test "$vers" -eq 000017; then
 +		if test "$vers" -ge 000017; then
- 			echo "$ac_t""$marker_ok found $verstxt" 1>&6
- 			cat >> confdefs.h <<\EOF
- #define ENABLE_GB 1
+ 			echo "$as_me:$LINENO: result: $marker_ok found $verstxt" >&5
+ echo "${ECHO_T}$marker_ok found $verstxt" >&6
+ 
diff --git a/math/gnumeric/files/patch-doc::gnumeric-doc.make b/math/gnumeric/files/patch-doc::gnumeric-doc.make
deleted file mode 100644
index 9ae036b7390a..000000000000
--- a/math/gnumeric/files/patch-doc::gnumeric-doc.make
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/gnumeric-doc.make	2002/06/07 19:30:21	1.1
-+++ doc/gnumeric-doc.make	2002/06/07 19:30:33
-@@ -9,7 +9,7 @@
- gnumeric_docdir  = $(top_srcdir)/doc
- sgml_ents = functions.sgml
- 
--gnumeric_helpdir = $(datadir)/gnome/help/gnumeric/$(lang)
-+gnumeric_helpdir = $(datadir)/help/gnumeric/$(lang)
- gnumeric_help_DATA = topic.dat
- 
- # include generated files to simplify installation
diff --git a/math/gnumeric/files/patch-plugins::gb::Makefile.in b/math/gnumeric/files/patch-plugins::gb::Makefile.in
index c0207945102a..5465dd84775a 100644
--- a/math/gnumeric/files/patch-plugins::gb::Makefile.in
+++ b/math/gnumeric/files/patch-plugins::gb::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- plugins/gb/Makefile.in.orig	Wed Nov  7 11:18:32 2001
-+++ plugins/gb/Makefile.in	Wed Nov  7 11:19:15 2001
-@@ -194,7 +194,7 @@
- gnum_gb_la_SOURCES =  	common.c				common.h				excel-gb-application.c			excel-gb-application.h			excel-gb-context.c			excel-gb-context.h			excel-gb-interior.c			excel-gb-interior.h			excel-gb-range.c			excel-gb-range.h			excel-gb-selection.c			excel-gb-selection.h			excel-gb-worksheet.c			excel-gb-worksheet.h			excel-gb-worksheets.c			excel-gb-worksheets.h			excel-gb-worksheet-function.c		excel-gb-worksheet-function.h		plugin.c				streams.h				streams.c
- 
- 
--gnum_gb_la_LIBADD =  	$(GB_LIBS)			$(GNUMERIC_LIBS)		-lm @GLIB_LIBS@ -lgb -lgbrun
-+gnum_gb_la_LIBADD =  	$(GB_LIBS)			$(GNUMERIC_LIBS)		-lm @GLIB_LIBS@ -lgbrun
+--- plugins/gb/Makefile.in.orig	Tue Dec 24 00:29:02 2002
++++ plugins/gb/Makefile.in	Tue Dec 24 00:29:57 2002
+@@ -311,7 +311,7 @@
+ gnum_gb_la_LIBADD = \
+ 	$(GB_LIBS)		\
+ 	$(GNUMERIC_LIBS)	\
+-	-lm @GLIB_LIBS@ -lgb -lgbrun
++	-lm @GLIB_LIBS@ -lgbrun
  
  
  xml_in_files = plugin.xml.in