From 934db5f69a9e869bdb5589acf1b4ff9709e7dfa9 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 16 Sep 2007 21:42:04 +0000 Subject: Sync with FreeBSD ports tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9592 df743ca5-7f9a-e211-a948-0013205c9059 --- math/gnumeric/Makefile | 6 +++--- math/gnumeric/distinfo | 6 +++--- math/gnumeric/files/patch-configure | 19 +++++-------------- math/gnumeric/files/patch-src_wbc-gtk-edit.c | 13 +++++++++++++ math/gnumeric/pkg-plist | 8 +++++--- 5 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 math/gnumeric/files/patch-src_wbc-gtk-edit.c diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 6af9de231..2618edfb8 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai # # $FreeBSD$ -# $MCom: ports/math/gnumeric/Makefile,v 1.37 2007/09/09 20:49:10 marcus Exp $ +# $MCom: ports/math/gnumeric/Makefile,v 1.38 2007/09/10 05:54:34 mezz Exp $ # PORTNAME= gnumeric -PORTVERSION= 1.7.11 -PORTREVISION= 2 +PORTVERSION= 1.7.12 +PORTREVISION= 1 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index c0253ed48..66e465ea1 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnumeric-1.7.11.tar.bz2) = 75e8c36afa8322c601a14cb5a35a8793 -SHA256 (gnome2/gnumeric-1.7.11.tar.bz2) = ee60415d849d8c4a48a16013a8925e70fcee16f934659677667cabd97e7b2516 -SIZE (gnome2/gnumeric-1.7.11.tar.bz2) = 13077190 +MD5 (gnome2/gnumeric-1.7.12.tar.bz2) = d00a63bac78e29920e5ea2fce8cfa25e +SHA256 (gnome2/gnumeric-1.7.12.tar.bz2) = b3ecf3a8fd51183252e692b9502336d6dc988a3748487488c5c06483e8ccb82a +SIZE (gnome2/gnumeric-1.7.12.tar.bz2) = 13685912 diff --git a/math/gnumeric/files/patch-configure b/math/gnumeric/files/patch-configure index 71ecb2bff..992b6246c 100644 --- a/math/gnumeric/files/patch-configure +++ b/math/gnumeric/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2007-07-29 02:46:18.000000000 -0400 -+++ configure 2007-07-29 02:48:14.000000000 -0400 -@@ -23472,12 +23472,12 @@ if test -n "$PKG_CONFIG"; then +--- configure.orig 2007-09-16 17:10:01.000000000 -0400 ++++ configure 2007-09-16 17:10:01.000000000 -0400 +@@ -23327,12 +23327,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GB_CFLAGS="$GB_CFLAGS" else if test -n "$PKG_CONFIG" && \ @@ -16,7 +16,7 @@ else pkg_failed=yes fi -@@ -23490,12 +23490,12 @@ if test -n "$PKG_CONFIG"; then +@@ -23345,12 +23345,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GB_LIBS="$GB_LIBS" else if test -n "$PKG_CONFIG" && \ @@ -32,7 +32,7 @@ else pkg_failed=yes fi -@@ -23514,9 +23514,9 @@ else +@@ -23369,9 +23369,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -44,12 +44,3 @@ fi # Put the nasty error message in config.log where it belongs echo "$GB_PKG_ERRORS" >&5 -@@ -27943,7 +27943,7 @@ echo $ECHO_N "checking - ======== for python = 2.x... $ECHO_C" >&6; } - PY_VERSION=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:3])'` - major_ver=`$PYTHON -c 'import sys ; sys.stdout.write(sys.version[0:1])'` -- if test "x$major_ver" == "x2"; then -+ if test "x$major_ver" = "x2"; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } - else diff --git a/math/gnumeric/files/patch-src_wbc-gtk-edit.c b/math/gnumeric/files/patch-src_wbc-gtk-edit.c new file mode 100644 index 000000000..fb3b8b2f4 --- /dev/null +++ b/math/gnumeric/files/patch-src_wbc-gtk-edit.c @@ -0,0 +1,13 @@ +--- src/wbc-gtk-edit.c.orig 2007-09-16 17:17:41.000000000 -0400 ++++ src/wbc-gtk-edit.c 2007-09-16 17:18:37.000000000 -0400 +@@ -887,8 +887,10 @@ wbcg_edit_start (WBCGtk *wbcg, + GOFormat *new_fmt; + int mbd; + ++#ifndef WITH_GOFFICE_0_4 + mbd = go_format_month_before_day (fmt); + if (mbd < 0) ++#endif + mbd = go_locale_month_before_day (); + + fstr = g_string_new (mbd ? "m/d/yyyy" : "d/m/yyyy"); diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index 4ff50f3df..c5e9de2ce 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -110,13 +110,11 @@ include/libspreadsheet-1-7/symbol.h include/libspreadsheet-1-7/validation-combo.h include/libspreadsheet-1-7/validation.h include/libspreadsheet-1-7/value.h +include/libspreadsheet-1-7/wbc-gtk-impl.h include/libspreadsheet-1-7/wbc-gtk.h include/libspreadsheet-1-7/workbook-cmd-format.h -include/libspreadsheet-1-7/workbook-control-gui-priv.h -include/libspreadsheet-1-7/workbook-control-gui.h include/libspreadsheet-1-7/workbook-control-priv.h include/libspreadsheet-1-7/workbook-control.h -include/libspreadsheet-1-7/workbook-edit.h include/libspreadsheet-1-7/workbook-priv.h include/libspreadsheet-1-7/workbook-view.h include/libspreadsheet-1-7/workbook.h @@ -831,6 +829,8 @@ share/locale/lt/LC_MESSAGES/gnumeric-functions.mo share/locale/lt/LC_MESSAGES/gnumeric.mo share/locale/lv/LC_MESSAGES/gnumeric-functions.mo share/locale/lv/LC_MESSAGES/gnumeric.mo +share/locale/mk/LC_MESSAGES/gnumeric-functions.mo +share/locale/mk/LC_MESSAGES/gnumeric.mo share/locale/ml/LC_MESSAGES/gnumeric-functions.mo share/locale/ml/LC_MESSAGES/gnumeric.mo share/locale/mr/LC_MESSAGES/gnumeric-functions.mo @@ -839,6 +839,8 @@ share/locale/ms/LC_MESSAGES/gnumeric-functions.mo share/locale/ms/LC_MESSAGES/gnumeric.mo share/locale/nb/LC_MESSAGES/gnumeric-functions.mo share/locale/nb/LC_MESSAGES/gnumeric.mo +share/locale/ne/LC_MESSAGES/gnumeric-functions.mo +share/locale/ne/LC_MESSAGES/gnumeric.mo share/locale/nl/LC_MESSAGES/gnumeric-functions.mo share/locale/nl/LC_MESSAGES/gnumeric.mo share/locale/nn/LC_MESSAGES/gnumeric-functions.mo -- cgit v1.2.3