Update to 0.68.

14 files changed, 104 insertions, 40 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index e421eaad73fa..aec50f32e338 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.67
-PORTREVISION=	1
+PORTVERSION=	0.68
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -16,7 +15,8 @@ MAINTAINER?=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile \
 		gnomeole2.0:${PORTSDIR}/devel/libole2 \
-		gbrun.0:${PORTSDIR}/lang/gnomebasic
+		gbrun.0:${PORTSDIR}/lang/gnomebasic \
+		giconv.2:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -37,5 +37,7 @@ pre-patch:
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC}/plugins/excel -name "*.[ch]" | xargs ${PERL} -pi -e \
+		's|iconv\.h|giconv.h|g'
 
 .include <bsd.port.mk>
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index aff7168fa542..01de25a12dd9 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.67.tar.bz2) = 92e5fafd4f013afea4cb57f304c831e3
+MD5 (gnumeric-0.68.tar.bz2) = a1bc7ba82f9c95404212916080cd2881
diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa
index 7917beccc0a4..c33c106d3436 100644
--- a/math/gnumeric/files/patch-aa
+++ b/math/gnumeric/files/patch-aa
@@ -1,6 +1,20 @@
---- configure.orig	Sun May 20 13:17:33 2001
-+++ configure	Mon May 21 11:57:29 2001
-@@ -10526,6 +10532,6 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Aug  6 12:35:22 2001
++++ configure	Mon Aug  6 12:36:51 2001
+@@ -9496,7 +9496,7 @@
+ done
+ 
+ 
+-for ac_hdr in iconv.h
++for ac_hdr in giconv.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -10664,10 +10664,10 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
  
 -  case "$ac_given_INSTALL" in
 -  [/$]*) INSTALL="$ac_given_INSTALL" ;;
@@ -11,3 +25,5 @@
 +#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 +#  esac
  
+   echo creating "$ac_file"
+   rm -f "$ac_file"
diff --git a/math/gnumeric/files/patch-plugins::dif::dif.c b/math/gnumeric/files/patch-plugins::dif::dif.c
deleted file mode 100644
index f8cee0d14d95..000000000000
--- a/math/gnumeric/files/patch-plugins::dif::dif.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- plugins/dif/dif.c	2001/07/09 16:17:34	1.1
-+++ plugins/dif/dif.c	2001/07/09 16:17:57
-@@ -8,6 +8,7 @@
-  *	Based on ff-csv code.
-  */
- #include <config.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <stdio.h>
diff --git a/math/gnumeric/files/patch-plugins::gb::excel-gb-interior.c b/math/gnumeric/files/patch-plugins::gb::excel-gb-interior.c
new file mode 100644
index 000000000000..c12c70c544b1
--- /dev/null
+++ b/math/gnumeric/files/patch-plugins::gb::excel-gb-interior.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- plugins/gb/excel-gb-interior.c	2001/08/06 10:12:43	1.1
++++ plugins/gb/excel-gb-interior.c	2001/08/06 10:17:01
+@@ -14,7 +14,6 @@
+ #include "sheet.h"
+ #include "cell.h"
+ #include "parse-util.h"
+-#include "command-context-corba.h"
+ #include "selection.h"
+ #include "commands.h"
+ 
diff --git a/math/gnumeric/files/patch-plugins::gb::excel-gb-range.c b/math/gnumeric/files/patch-plugins::gb::excel-gb-range.c
new file mode 100644
index 000000000000..26c30dca5680
--- /dev/null
+++ b/math/gnumeric/files/patch-plugins::gb::excel-gb-range.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- plugins/gb/excel-gb-range.c	2001/08/06 10:18:32	1.1
++++ plugins/gb/excel-gb-range.c	2001/08/06 10:18:40
+@@ -15,7 +15,6 @@
+ #include "cell.h"
+ #include "parse-util.h"
+ #include "commands.h"
+-#include "command-context-corba.h"
+ #include "selection.h"
+ 
+ #include <gbrun/libgbrun.h>
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 1450481e694d..ad9f1249a418 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -684,6 +684,7 @@ share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
 share/locale/ja/LC_MESSAGES/gnumeric.mo
 share/locale/nl/LC_MESSAGES/gnumeric.mo
+share/locale/nn/LC_MESSAGES/gnumeric.mo
 share/locale/no/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index e421eaad73fa..aec50f32e338 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric
-PORTVERSION=	0.67
-PORTREVISION=	1
+PORTVERSION=	0.68
 CATEGORIES?=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -16,7 +15,8 @@ MAINTAINER?=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile \
 		gnomeole2.0:${PORTSDIR}/devel/libole2 \
-		gbrun.0:${PORTSDIR}/lang/gnomebasic
+		gbrun.0:${PORTSDIR}/lang/gnomebasic \
+		giconv.2:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -37,5 +37,7 @@ pre-patch:
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC}/plugins/excel -name "*.[ch]" | xargs ${PERL} -pi -e \
+		's|iconv\.h|giconv.h|g'
 
 .include <bsd.port.mk>
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index aff7168fa542..01de25a12dd9 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnumeric-0.67.tar.bz2) = 92e5fafd4f013afea4cb57f304c831e3
+MD5 (gnumeric-0.68.tar.bz2) = a1bc7ba82f9c95404212916080cd2881
diff --git a/math/gnumeric2/files/patch-aa b/math/gnumeric2/files/patch-aa
index 7917beccc0a4..c33c106d3436 100644
--- a/math/gnumeric2/files/patch-aa
+++ b/math/gnumeric2/files/patch-aa
@@ -1,6 +1,20 @@
---- configure.orig	Sun May 20 13:17:33 2001
-+++ configure	Mon May 21 11:57:29 2001
-@@ -10526,6 +10532,6 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Aug  6 12:35:22 2001
++++ configure	Mon Aug  6 12:36:51 2001
+@@ -9496,7 +9496,7 @@
+ done
+ 
+ 
+-for ac_hdr in iconv.h
++for ac_hdr in giconv.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -10664,10 +10664,10 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
  
 -  case "$ac_given_INSTALL" in
 -  [/$]*) INSTALL="$ac_given_INSTALL" ;;
@@ -11,3 +25,5 @@
 +#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 +#  esac
  
+   echo creating "$ac_file"
+   rm -f "$ac_file"
diff --git a/math/gnumeric2/files/patch-plugins::dif::dif.c b/math/gnumeric2/files/patch-plugins::dif::dif.c
deleted file mode 100644
index f8cee0d14d95..000000000000
--- a/math/gnumeric2/files/patch-plugins::dif::dif.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- plugins/dif/dif.c	2001/07/09 16:17:34	1.1
-+++ plugins/dif/dif.c	2001/07/09 16:17:57
-@@ -8,6 +8,7 @@
-  *	Based on ff-csv code.
-  */
- #include <config.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <stdio.h>
diff --git a/math/gnumeric2/files/patch-plugins::gb::excel-gb-interior.c b/math/gnumeric2/files/patch-plugins::gb::excel-gb-interior.c
new file mode 100644
index 000000000000..c12c70c544b1
--- /dev/null
+++ b/math/gnumeric2/files/patch-plugins::gb::excel-gb-interior.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- plugins/gb/excel-gb-interior.c	2001/08/06 10:12:43	1.1
++++ plugins/gb/excel-gb-interior.c	2001/08/06 10:17:01
+@@ -14,7 +14,6 @@
+ #include "sheet.h"
+ #include "cell.h"
+ #include "parse-util.h"
+-#include "command-context-corba.h"
+ #include "selection.h"
+ #include "commands.h"
+ 
diff --git a/math/gnumeric2/files/patch-plugins::gb::excel-gb-range.c b/math/gnumeric2/files/patch-plugins::gb::excel-gb-range.c
new file mode 100644
index 000000000000..26c30dca5680
--- /dev/null
+++ b/math/gnumeric2/files/patch-plugins::gb::excel-gb-range.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- plugins/gb/excel-gb-range.c	2001/08/06 10:18:32	1.1
++++ plugins/gb/excel-gb-range.c	2001/08/06 10:18:40
+@@ -15,7 +15,6 @@
+ #include "cell.h"
+ #include "parse-util.h"
+ #include "commands.h"
+-#include "command-context-corba.h"
+ #include "selection.h"
+ 
+ #include <gbrun/libgbrun.h>
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 1450481e694d..ad9f1249a418 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -684,6 +684,7 @@ share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
 share/locale/ja/LC_MESSAGES/gnumeric.mo
 share/locale/nl/LC_MESSAGES/gnumeric.mo
+share/locale/nn/LC_MESSAGES/gnumeric.mo
 share/locale/no/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric.mo