diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-07-09 16:46:59 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-07-09 16:46:59 +0000 |
commit | c728c60608f17c34c4a8946977b2473fc89fbc2a (patch) | |
tree | 7243ff41661c867ca95ae49c4417ca67ef6f249a /math/gnumeric | |
parent | Update to 0.0.20. (diff) |
Update to 0.67.
Notes
Notes:
svn path=/head/; revision=44970
Diffstat (limited to 'math/gnumeric')
-rw-r--r-- | math/gnumeric/Makefile | 13 | ||||
-rw-r--r-- | math/gnumeric/distinfo | 2 | ||||
-rw-r--r-- | math/gnumeric/files/patch-aa | 47 | ||||
-rw-r--r-- | math/gnumeric/files/patch-ltmain.sh | 18 | ||||
-rw-r--r-- | math/gnumeric/files/patch-plugins::dif::dif.c | 13 | ||||
-rw-r--r-- | math/gnumeric/files/patch-plugins::excel::ms-excel-util.c | 7 | ||||
-rw-r--r-- | math/gnumeric/files/patch-plugins::gb::Makefile.in | 14 | ||||
-rw-r--r-- | math/gnumeric/files/patch-po::Makefile.in.in | 7 | ||||
-rw-r--r-- | math/gnumeric/pkg-plist | 37 |
9 files changed, 84 insertions, 74 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 48594de41f57..40d41f9ae72e 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnumeric -PORTVERSION= 0.65 -PORTREVISION= 2 +PORTVERSION= 0.67 CATEGORIES?= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnumeric @@ -16,25 +15,25 @@ MAINTAINER?= gnome@FreeBSD.org LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ - gb.0:${PORTSDIR}/lang/gnomebasic + gbrun.0:${PORTSDIR}/lang/gnomebasic +USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOME= yes USE_PYTHON= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --without-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" -PLIST_SUB= VERSION=${PORTVERSION} +PLIST_SUB= VERSION=${PORTVERSION}-bonobo pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index 9711985a9032..aff7168fa542 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1 +1 @@ -MD5 (gnumeric-0.65.tar.gz) = d31a2258b3f8ded219677a54f4fbe23f +MD5 (gnumeric-0.67.tar.bz2) = 92e5fafd4f013afea4cb57f304c831e3 diff --git a/math/gnumeric/files/patch-aa b/math/gnumeric/files/patch-aa index 38602b0b16a8..7917beccc0a4 100644 --- a/math/gnumeric/files/patch-aa +++ b/math/gnumeric/files/patch-aa @@ -1,52 +1,5 @@ --- configure.orig Sun May 20 13:17:33 2001 +++ configure Mon May 21 11:57:29 2001 -@@ -5591,4 +5591,19 @@ - -- -- -+# Actually configure libtool. ac_aux_dir is where install-sh is found. -+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -+$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \ -+|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+ -+# Reload cache, that may have been modified by ltconfig -+if test -r "$cache_file"; then -+ echo "loading cache $cache_file" -+ . $cache_file -+else -+ echo "creating cache $cache_file" -+ > $cache_file -+fi - -@@ -5596,3 +5611,3 @@ - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - -@@ -5601,16 +5616,7 @@ - --# Prevent multiple expansion -+# Redirect the config.log output again, so that the ltconfig log is not -+# clobbered by the next message. -+exec 5>>./config.log - - -- -- -- -- -- -- -- -- -- -- -- - # Check whether --with-gnome-includes or --without-gnome-includes was given. @@ -10526,6 +10532,6 @@ - case "$ac_given_INSTALL" in diff --git a/math/gnumeric/files/patch-ltmain.sh b/math/gnumeric/files/patch-ltmain.sh new file mode 100644 index 000000000000..af8915758609 --- /dev/null +++ b/math/gnumeric/files/patch-ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/07/09 15:41:44 1.1 ++++ ltmain.sh 2001/07/09 15:41:59 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/math/gnumeric/files/patch-plugins::dif::dif.c b/math/gnumeric/files/patch-plugins::dif::dif.c new file mode 100644 index 000000000000..f8cee0d14d95 --- /dev/null +++ b/math/gnumeric/files/patch-plugins::dif::dif.c @@ -0,0 +1,13 @@ + +$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::excel::ms-excel-util.c b/math/gnumeric/files/patch-plugins::excel::ms-excel-util.c deleted file mode 100644 index 84d90e338e6f..000000000000 --- a/math/gnumeric/files/patch-plugins::excel::ms-excel-util.c +++ /dev/null @@ -1,7 +0,0 @@ ---- plugins/excel/ms-excel-util.c.orig Mon May 7 18:58:07 2001 -+++ plugins/excel/ms-excel-util.c Tue May 22 17:03:18 2001 -@@ -383,3 +383,3 @@ - charset = nl_langinfo (CODESET); --#elif -+#else - { diff --git a/math/gnumeric/files/patch-plugins::gb::Makefile.in b/math/gnumeric/files/patch-plugins::gb::Makefile.in new file mode 100644 index 000000000000..921407563055 --- /dev/null +++ b/math/gnumeric/files/patch-plugins::gb::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- plugins/gb/Makefile.in 2001/07/09 16:19:36 1.1 ++++ plugins/gb/Makefile.in 2001/07/09 16:19:48 +@@ -181,7 +181,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) $(EXTRA_GNOME_LIBS) -lm @GLIB_LIBS@ -lgb -lgbrun ++gnum_gb_la_LIBADD = $(GB_LIBS) $(EXTRA_GNOME_LIBS) -lm @GLIB_LIBS@ -lgbrun + + + EXTRA_DIST = README main.gba gnumeric.gbp $(gnum_gb_DATA) diff --git a/math/gnumeric/files/patch-po::Makefile.in.in b/math/gnumeric/files/patch-po::Makefile.in.in deleted file mode 100644 index 2ee6d57354b7..000000000000 --- a/math/gnumeric/files/patch-po::Makefile.in.in +++ /dev/null @@ -1,7 +0,0 @@ ---- po/Makefile.in.in.orig Sun May 20 11:15:03 2001 -+++ po/Makefile.in.in Mon May 21 12:28:25 2001 -@@ -22,3 +22,3 @@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gettextsrcdir = $(datadir)/gettext/po diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index 8277449a0520..1450481e694d 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -1,14 +1,20 @@ bin/gnumeric -etc/CORBA/servers/gnumeric.gnorba etc/gnumericConf.sh lib/gnumeric/%%VERSION%%/plugins/applix/applix.so lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/derivatives/derivatives.so +lib/gnumeric/%%VERSION%%/plugins/derivatives/plugin.xml lib/gnumeric/%%VERSION%%/plugins/dif/dif.so lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml lib/gnumeric/%%VERSION%%/plugins/excel/excel.so lib/gnumeric/%%VERSION%%/plugins/excel/plugin.xml lib/gnumeric/%%VERSION%%/plugins/gb/gnum_gb.so lib/gnumeric/%%VERSION%%/plugins/gb/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so +lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header +lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py +lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/plugin.xml lib/gnumeric/%%VERSION%%/plugins/html/html.so lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so @@ -17,6 +23,12 @@ lib/gnumeric/%%VERSION%%/plugins/numtheory/numtheory.so lib/gnumeric/%%VERSION%%/plugins/numtheory/plugin.xml lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.so lib/gnumeric/%%VERSION%%/plugins/oleo/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py +lib/gnumeric/%%VERSION%%/plugins/python-loader/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.so +lib/gnumeric/%%VERSION%%/plugins/python/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/python/python.so lib/gnumeric/%%VERSION%%/plugins/sc/plugin.xml lib/gnumeric/%%VERSION%%/plugins/sc/sc.so lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml @@ -65,6 +77,8 @@ share/gnome/gnumeric/%%VERSION%%/glade/autosave.glade share/gnome/gnumeric/%%VERSION%%/glade/cell-format.glade share/gnome/gnumeric/%%VERSION%%/glade/cell-sort.glade share/gnome/gnumeric/%%VERSION%%/glade/col-width.glade +share/gnome/gnumeric/%%VERSION%%/glade/colrow.glade +share/gnome/gnumeric/%%VERSION%%/glade/consolidate.glade share/gnome/gnumeric/%%VERSION%%/glade/delete-cells.glade share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade @@ -74,7 +88,6 @@ share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade share/gnome/gnumeric/%%VERSION%%/glade/graph-guru.glade share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade -share/gnome/gnumeric/%%VERSION%%/glade/import.glade share/gnome/gnumeric/%%VERSION%%/glade/insert-cells.glade share/gnome/gnumeric/%%VERSION%%/glade/names.glade share/gnome/gnumeric/%%VERSION%%/glade/plugin-manager.glade @@ -88,8 +101,11 @@ share/gnome/gnumeric/%%VERSION%%/glade/solver.glade share/gnome/gnumeric/%%VERSION%%/glade/summary.glade share/gnome/gnumeric/%%VERSION%%/glade/validate.glade share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade +share/gnome/gnumeric/%%VERSION%%/gnome/ui/GNOME_Gnumeric.xml share/gnome/gnumeric/%%VERSION%%/idl/Gnumeric.idl share/gnome/gnumeric/%%VERSION%%/idl/gnumeric-graphs.idl +share/gnome/gnumeric/%%VERSION%%/python/gnumeric_defs.py +share/gnome/gnumeric/%%VERSION%%/python/gnumeric_startup.py share/gnome/gnumeric/%%VERSION%%/templates/invoice.gnumeric share/gnome/gnumeric/%%VERSION%%/templates/loan.gnumeric share/gnome/gnumeric/%%VERSION%%/templates/mileage.gnumeric @@ -585,7 +601,7 @@ share/gnome/help/gnumeric/C/tutorials.html share/gnome/mc/templates/gnumeric.desktop share/gnome/mime-info/gnumeric.keys share/gnome/mime-info/gnumeric.mime -share/gnome/oaf/GNOME_Gnumeric.oafinfo +share/gnome/oaf/GNOME_Gnumeric.oaf share/gnome/pixmaps/gnome-application-x-gnumeric.png share/gnome/pixmaps/gnome-application-x-xls.png share/gnome/pixmaps/gnome-gnumeric.png @@ -642,7 +658,6 @@ share/gnome/pixmaps/gnumeric/right-down.png share/gnome/pixmaps/gnumeric/right_border share/gnome/pixmaps/gnumeric/stf-druid.png share/gnome/pixmaps/gnumeric/top_border -share/gnome/ui/GNOME_Gnumeric.xml share/locale/ca/LC_MESSAGES/gnumeric.mo share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/da/LC_MESSAGES/gnumeric.mo @@ -667,6 +682,7 @@ share/locale/gl/LC_MESSAGES/gnumeric.mo share/locale/hr/LC_MESSAGES/gnumeric.mo 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/no/LC_MESSAGES/gnumeric.mo share/locale/pl/LC_MESSAGES/gnumeric.mo @@ -677,11 +693,17 @@ share/locale/sk/LC_MESSAGES/gnumeric.mo share/locale/sv/LC_MESSAGES/gnumeric.mo share/locale/tr/LC_MESSAGES/gnumeric.mo share/locale/uk/LC_MESSAGES/gnumeric.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo +share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo +@dirrm share/gnome/pixmaps/gnumeric @dirrm share/gnome/help/gnumeric/C/images @dirrm share/gnome/help/gnumeric/C @dirrm share/gnome/help/gnumeric @dirrm share/gnome/gnumeric/%%VERSION%%/templates +@dirrm share/gnome/gnumeric/%%VERSION%%/python @dirrm share/gnome/gnumeric/%%VERSION%%/idl +@dirrm share/gnome/gnumeric/%%VERSION%%/gnome/ui +@dirrm share/gnome/gnumeric/%%VERSION%%/gnome @dirrm share/gnome/gnumeric/%%VERSION%%/glade @dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/List @dirrm share/gnome/gnumeric/%%VERSION%%/autoformat-templates/General @@ -693,19 +715,24 @@ share/locale/uk/LC_MESSAGES/gnumeric.mo @dirrm share/gnome/gnumeric/%%VERSION%% @dirrm share/gnome/gnumeric @unexec rmdir %D/share/gnome/oaf 2>/dev/null || true -@dirrm share/gnome/pixmaps/gnumeric @dirrm lib/gnumeric/%%VERSION%%/plugins/xml_sax @dirrm lib/gnumeric/%%VERSION%%/plugins/xbase @dirrm lib/gnumeric/%%VERSION%%/plugins/sylk @dirrm lib/gnumeric/%%VERSION%%/plugins/sc +@dirrm lib/gnumeric/%%VERSION%%/plugins/python-loader +@dirrm lib/gnumeric/%%VERSION%%/plugins/python +@dirrm lib/gnumeric/%%VERSION%%/plugins/py-func @dirrm lib/gnumeric/%%VERSION%%/plugins/plan_perfect @dirrm lib/gnumeric/%%VERSION%%/plugins/oleo @dirrm lib/gnumeric/%%VERSION%%/plugins/numtheory @dirrm lib/gnumeric/%%VERSION%%/plugins/lotus @dirrm lib/gnumeric/%%VERSION%%/plugins/html +@dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-glossary +@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif @dirrm lib/gnumeric/%%VERSION%%/plugins/gb @dirrm lib/gnumeric/%%VERSION%%/plugins/excel @dirrm lib/gnumeric/%%VERSION%%/plugins/dif +@dirrm lib/gnumeric/%%VERSION%%/plugins/derivatives @dirrm lib/gnumeric/%%VERSION%%/plugins/applix @dirrm lib/gnumeric/%%VERSION%%/plugins @dirrm lib/gnumeric/%%VERSION%% |