From 42df3e6bd5bed95656b7573160ddab16da103dd2 Mon Sep 17 00:00:00 2001 From: rh Date: Thu, 1 Jun 2000 12:07:58 +0000 Subject: [PATCH] Remove a lot of patches, now that we can use OTS libtool Update gnumeric to 0.54 Notable changes are: * Bug fixes. * Enable mini icons when available. * Initial applix import. * Speedup workbook exit, copy/paste. * Improve row/col insert/del. * Lots of dialog polishing. * Autoscrolling combo boxes. * Make tearoff combo boxes behave more like tearoff menus. * Get embedded gnumeric working again. * New: gl (Jesus). * Updated: de (Karl), no (Kjartan), sv (Andreas), and more. --- math/gnumeric/Makefile | 8 +- math/gnumeric/files/md5 | 4 +- math/gnumeric/files/patch-sum | 15 +--- math/gnumeric/patches/patch-ab | 35 +++----- math/gnumeric/patches/patch-ac | 24 ------ math/gnumeric/patches/patch-ad | 24 ------ math/gnumeric/patches/patch-ae | 24 ------ math/gnumeric/patches/patch-af | 24 ------ math/gnumeric/patches/patch-ag | 24 ------ math/gnumeric/patches/patch-ah | 24 ------ math/gnumeric/patches/patch-ai | 24 ------ math/gnumeric/patches/patch-aj | 24 ------ math/gnumeric/patches/patch-ak | 24 ------ math/gnumeric/patches/patch-al | 24 ------ math/gnumeric/patches/patch-am | 24 ------ math/gnumeric/pkg/PLIST | 153 ++++++++++++++++++++++----------- 16 files changed, 122 insertions(+), 357 deletions(-) delete mode 100644 math/gnumeric/patches/patch-ac delete mode 100644 math/gnumeric/patches/patch-ad delete mode 100644 math/gnumeric/patches/patch-ae delete mode 100644 math/gnumeric/patches/patch-af delete mode 100644 math/gnumeric/patches/patch-ag delete mode 100644 math/gnumeric/patches/patch-ah delete mode 100644 math/gnumeric/patches/patch-ai delete mode 100644 math/gnumeric/patches/patch-aj delete mode 100644 math/gnumeric/patches/patch-ak delete mode 100644 math/gnumeric/patches/patch-al delete mode 100644 math/gnumeric/patches/patch-am diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 0b57672a61a0..ce0f077a6712 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2000/05/30 09:16:06 rh Exp $ +# $NetBSD: Makefile,v 1.19 2000/06/01 12:07:58 rh Exp $ # -DISTNAME= gnumeric-0.53 +DISTNAME= gnumeric-0.54 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnumeric/} @@ -10,9 +10,9 @@ HOMEPAGE= http://www.gnome.org/gnumeric/ BUILD_DEPENDS+= ${LOCALBASE}/bin/python:../../lang/python DEPENDS+= gnome-core-*:../../x11/gnome-core -DEPENDS+= gnome-print>=0.19:../../print/gnome-print +DEPENDS+= gnome-print>=0.20:../../print/gnome-print DEPENDS+= libxml>=1.8.5:../../textproc/libxml -DEPENDS+= libglade>=0.11:../../devel/libglade +DEPENDS+= libglade>=0.13:../../devel/libglade GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/math/gnumeric/files/md5 b/math/gnumeric/files/md5 index 003b2f515d46..04b10836e7f4 100644 --- a/math/gnumeric/files/md5 +++ b/math/gnumeric/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.9 2000/05/30 09:16:08 rh Exp $ +$NetBSD: md5,v 1.10 2000/06/01 12:07:59 rh Exp $ -MD5 (gnumeric-0.53.tar.gz) = 775b2b8ad8c4192bf50b3bdc03292e85 +MD5 (gnumeric-0.54.tar.gz) = 3a323d6d301d0e0acb908798e9875a17 diff --git a/math/gnumeric/files/patch-sum b/math/gnumeric/files/patch-sum index e60f47b4b7f5..fabde911705f 100644 --- a/math/gnumeric/files/patch-sum +++ b/math/gnumeric/files/patch-sum @@ -1,15 +1,4 @@ -$NetBSD: patch-sum,v 1.8 2000/05/30 09:16:09 rh Exp $ +$NetBSD: patch-sum,v 1.9 2000/06/01 12:07:59 rh Exp $ MD5 (patch-aa) = 6d0e0c44cf66860806cff45ce15905bb -MD5 (patch-ab) = 28a2ae664f313aecb256d74ed88e4049 -MD5 (patch-ac) = caece7d0c4a347fca956b1d776b581c0 -MD5 (patch-ad) = 202a12f732e4f80321d57c1a955ef26c -MD5 (patch-ae) = e94eb77e9efd1f36a97bf5155efbec1a -MD5 (patch-af) = c04053e78ff6ec03255b183198f98658 -MD5 (patch-ag) = fc4498d5d8e7377b64645f39a21753ad -MD5 (patch-ah) = 9162d808e9f46c92545a5f0bd069db99 -MD5 (patch-ai) = 7d9b92e4d1226c5f58816c77c45c906e -MD5 (patch-aj) = c5b4b3b6f18172d4ddd9898902d74888 -MD5 (patch-ak) = 1927ba2edd8509a22bc48de00d6f268f -MD5 (patch-al) = 7c166cd190385719201067241cb136d9 -MD5 (patch-am) = 006af88310ff37d430bf1822dac5b947 +MD5 (patch-ab) = 68a2a0bf957929888e08a05fa241dbcd diff --git a/math/gnumeric/patches/patch-ab b/math/gnumeric/patches/patch-ab index 7b875ddb071f..7f76c14981d6 100644 --- a/math/gnumeric/patches/patch-ab +++ b/math/gnumeric/patches/patch-ab @@ -1,24 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2000/05/30 09:16:10 rh Exp $ +$NetBSD: patch-ab,v 1.3 2000/06/01 12:08:00 rh Exp $ ---- plugins/python/Makefile.in.orig Wed May 10 04:59:07 2000 -+++ plugins/python/Makefile.in Fri May 19 23:49:29 2000 -@@ -157,7 +157,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(PY_CFLAGS) $(GNOME_INCLUDEDIR) - - --noinst_LTLIBRARIES = gnum_python.la -+noinst_LTLIBRARIES = gnum_python.a - gnum_python_la_LDFLAGS = -module -avoid-version $(PY_LIB_LOC) - - gnum_python_la_SOURCES = python.c -@@ -250,7 +250,9 @@ - - maintainer-clean-libtool: - --gnum_python.la: $(gnum_python_la_OBJECTS) $(gnum_python_la_DEPENDENCIES) -+gnum_python.la: gnum_python.a -+ -+gnum_python.a: $(gnum_python_la_OBJECTS) $(gnum_python_la_DEPENDENCIES) - $(LINK) $(gnum_python_la_LDFLAGS) $(gnum_python_la_OBJECTS) $(gnum_python_la_LIBADD) $(LIBS) - - install-PythonscriptsDATA: $(Pythonscripts_DATA) +--- libole2/doc/Makefile.in.orig Sun May 21 08:26:49 2000 ++++ libole2/doc/Makefile.in Wed May 31 20:59:55 2000 +@@ -272,8 +272,6 @@ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ + echo '-- Fixing Crossreferences' ; \ + gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \ + fi) diff --git a/math/gnumeric/patches/patch-ac b/math/gnumeric/patches/patch-ac deleted file mode 100644 index 81e8677d2925..000000000000 --- a/math/gnumeric/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/lotus-123/Makefile.in.orig Wed May 10 04:58:49 2000 -+++ plugins/lotus-123/Makefile.in Fri May 19 23:49:13 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_lotus.la -+gnumeric_plugin_LTLIBRARIES = gnum_lotus.a - gnum_lotus_la_LDFLAGS = -module -avoid-version - gnum_lotus_la_SOURCES = boot.c lotus-types.h lotus.h lotus.c lotus-formula.h lotus-formula.c - -@@ -258,7 +258,9 @@ - - maintainer-clean-libtool: - --gnum_lotus.la: $(gnum_lotus_la_OBJECTS) $(gnum_lotus_la_DEPENDENCIES) -+gnum_lotus.la: gnum_lotus.a -+ -+gnum_lotus.a: $(gnum_lotus_la_OBJECTS) $(gnum_lotus_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_lotus_la_LDFLAGS) $(gnum_lotus_la_OBJECTS) $(gnum_lotus_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-ad b/math/gnumeric/patches/patch-ad deleted file mode 100644 index 534139eeb991..000000000000 --- a/math/gnumeric/patches/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/oleo/Makefile.in.orig Wed May 10 04:58:51 2000 -+++ plugins/oleo/Makefile.in Fri May 19 23:49:17 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_oleo.la -+gnumeric_plugin_LTLIBRARIES = gnum_oleo.a - gnum_oleo_la_LDFLAGS = -module -avoid-version - gnum_oleo_la_SOURCES = boot.c oleo.h oleo.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_oleo.la: $(gnum_oleo_la_OBJECTS) $(gnum_oleo_la_DEPENDENCIES) -+gnum_oleo.la: gnum_oleo.a -+ -+gnum_oleo.a: $(gnum_oleo_la_OBJECTS) $(gnum_oleo_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_oleo_la_LDFLAGS) $(gnum_oleo_la_OBJECTS) $(gnum_oleo_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-ae b/math/gnumeric/patches/patch-ae deleted file mode 100644 index 9b1d1d12c565..000000000000 --- a/math/gnumeric/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/sc/Makefile.in.orig Wed May 10 04:58:53 2000 -+++ plugins/sc/Makefile.in Fri May 19 23:49:34 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_sc.la -+gnumeric_plugin_LTLIBRARIES = gnum_sc.a - gnum_sc_la_LDFLAGS = -module -avoid-version - gnum_sc_la_SOURCES = sc.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_sc.la: $(gnum_sc_la_OBJECTS) $(gnum_sc_la_DEPENDENCIES) -+gnum_sc.la: gnum_sc.a -+ -+gnum_sc.a: $(gnum_sc_la_OBJECTS) $(gnum_sc_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_sc_la_LDFLAGS) $(gnum_sc_la_OBJECTS) $(gnum_sc_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-af b/math/gnumeric/patches/patch-af deleted file mode 100644 index fd26a344082f..000000000000 --- a/math/gnumeric/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/sylk/Makefile.in.orig Wed May 10 04:58:55 2000 -+++ plugins/sylk/Makefile.in Fri May 19 23:49:37 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_sylk.la -+gnumeric_plugin_LTLIBRARIES = gnum_sylk.a - gnum_sylk_la_LDFLAGS = -module -avoid-version - gnum_sylk_la_SOURCES = sylk.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_sylk.la: $(gnum_sylk_la_OBJECTS) $(gnum_sylk_la_DEPENDENCIES) -+gnum_sylk.la: gnum_sylk.a -+ -+gnum_sylk.a: $(gnum_sylk_la_OBJECTS) $(gnum_sylk_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_sylk_la_LDFLAGS) $(gnum_sylk_la_OBJECTS) $(gnum_sylk_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-ag b/math/gnumeric/patches/patch-ag deleted file mode 100644 index e779704c876d..000000000000 --- a/math/gnumeric/patches/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/text/Makefile.in.orig Wed May 10 04:58:57 2000 -+++ plugins/text/Makefile.in Fri May 19 23:49:39 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_text.la -+gnumeric_plugin_LTLIBRARIES = gnum_text.a - gnum_text_la_LDFLAGS = -module -avoid-version - gnum_text_la_SOURCES = text-io.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_text.la: $(gnum_text_la_OBJECTS) $(gnum_text_la_DEPENDENCIES) -+gnum_text.la: gnum_text.a -+ -+gnum_text.a: $(gnum_text_la_OBJECTS) $(gnum_text_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_text_la_LDFLAGS) $(gnum_text_la_OBJECTS) $(gnum_text_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-ah b/math/gnumeric/patches/patch-ah deleted file mode 100644 index 3a8c7a18e382..000000000000 --- a/math/gnumeric/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/ff-csv/Makefile.in.orig Wed May 10 04:58:58 2000 -+++ plugins/ff-csv/Makefile.in Fri May 19 23:48:56 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_csv.la -+gnumeric_plugin_LTLIBRARIES = gnum_csv.a - gnum_csv_la_LDFLAGS = -module -avoid-version - gnum_csv_la_SOURCES = csv-io.h csv-io.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_csv.la: $(gnum_csv_la_OBJECTS) $(gnum_csv_la_DEPENDENCIES) -+gnum_csv.la: gnum_csv.a -+ -+gnum_csv.a: $(gnum_csv_la_OBJECTS) $(gnum_csv_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_csv_la_LDFLAGS) $(gnum_csv_la_OBJECTS) $(gnum_csv_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-ai b/math/gnumeric/patches/patch-ai deleted file mode 100644 index e087732db057..000000000000 --- a/math/gnumeric/patches/patch-ai +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2000/05/30 09:16:11 rh Exp $ - ---- plugins/xbase/Makefile.in.orig Wed May 10 04:59:00 2000 -+++ plugins/xbase/Makefile.in Fri May 19 23:49:44 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_xbase.la -+gnumeric_plugin_LTLIBRARIES = gnum_xbase.a - gnum_xbase_la_LDFLAGS = -module -avoid-version - gnum_xbase_la_SOURCES = boot.c xbase.h xbase.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_xbase.la: $(gnum_xbase_la_OBJECTS) $(gnum_xbase_la_DEPENDENCIES) -+gnum_xbase.la: gnum_xbase.a -+ -+gnum_xbase.a: $(gnum_xbase_la_OBJECTS) $(gnum_xbase_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_xbase_la_LDFLAGS) $(gnum_xbase_la_OBJECTS) $(gnum_xbase_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-aj b/math/gnumeric/patches/patch-aj deleted file mode 100644 index cbe0efa92767..000000000000 --- a/math/gnumeric/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2000/05/30 09:16:12 rh Exp $ - ---- plugins/html/Makefile.in.orig Wed May 10 04:59:02 2000 -+++ plugins/html/Makefile.in Fri May 19 23:49:10 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_html.la -+gnumeric_plugin_LTLIBRARIES = gnum_html.a - gnum_html_la_LDFLAGS = -module -avoid-version - gnum_html_la_SOURCES = boot.h boot.c html.h html.c latex.h latex.c roff.h roff.c font.h font.c - -@@ -262,7 +262,9 @@ - - maintainer-clean-libtool: - --gnum_html.la: $(gnum_html_la_OBJECTS) $(gnum_html_la_DEPENDENCIES) -+gnum_html.la: gnum_html.a -+ -+gnum_html.a: $(gnum_html_la_OBJECTS) $(gnum_html_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_html_la_LDFLAGS) $(gnum_html_la_OBJECTS) $(gnum_html_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-ak b/math/gnumeric/patches/patch-ak deleted file mode 100644 index 28e8f7a0bca4..000000000000 --- a/math/gnumeric/patches/patch-ak +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2000/05/30 09:16:12 rh Exp $ - ---- plugins/dif/Makefile.in.orig Wed May 10 04:59:04 2000 -+++ plugins/dif/Makefile.in Fri May 19 23:48:15 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_dif.la -+gnumeric_plugin_LTLIBRARIES = gnum_dif.a - gnum_dif_la_LDFLAGS = -module -avoid-version - gnum_dif_la_SOURCES = dif.h dif.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_dif.la: $(gnum_dif_la_OBJECTS) $(gnum_dif_la_DEPENDENCIES) -+gnum_dif.la: gnum_dif.a -+ -+gnum_dif.a: $(gnum_dif_la_OBJECTS) $(gnum_dif_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_dif_la_LDFLAGS) $(gnum_dif_la_OBJECTS) $(gnum_dif_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-al b/math/gnumeric/patches/patch-al deleted file mode 100644 index a511c060f844..000000000000 --- a/math/gnumeric/patches/patch-al +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-al,v 1.1 2000/05/30 09:16:12 rh Exp $ - ---- plugins/sample/Makefile.in.orig Wed May 10 04:59:14 2000 -+++ plugins/sample/Makefile.in Fri May 19 23:49:31 2000 -@@ -164,7 +164,7 @@ - - # The naming convention used for plugins is - # gnum_.so --gnumeric_plugin_LTLIBRARIES = gnum_sample.la -+gnumeric_plugin_LTLIBRARIES = gnum_sample.a - - # Don't bother versioning - gnum_sample_la_LDFLAGS = -module -avoid-version -@@ -267,7 +267,9 @@ - - maintainer-clean-libtool: - --gnum_sample.la: $(gnum_sample_la_OBJECTS) $(gnum_sample_la_DEPENDENCIES) -+gnum_sample.la: gnum_sample.a -+ -+gnum_sample.a: $(gnum_sample_la_OBJECTS) $(gnum_sample_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_sample_la_LDFLAGS) $(gnum_sample_la_OBJECTS) $(gnum_sample_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/patches/patch-am b/math/gnumeric/patches/patch-am deleted file mode 100644 index ca8667b4a49a..000000000000 --- a/math/gnumeric/patches/patch-am +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-am,v 1.1 2000/05/30 09:16:12 rh Exp $ - ---- plugins/numtheory/Makefile.in.orig Wed May 10 04:59:16 2000 -+++ plugins/numtheory/Makefile.in Fri May 19 23:49:15 2000 -@@ -156,7 +156,7 @@ - INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR) - - --gnumeric_plugin_LTLIBRARIES = gnum_numtheory.la -+gnumeric_plugin_LTLIBRARIES = gnum_numtheory.a - gnum_numtheory_la_LDFLAGS = -module -avoid-version - gnum_numtheory_la_SOURCES = numtheory.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -257,7 +257,9 @@ - - maintainer-clean-libtool: - --gnum_numtheory.la: $(gnum_numtheory_la_OBJECTS) $(gnum_numtheory_la_DEPENDENCIES) -+gnum_numtheory.la: gnum_numtheory.a -+ -+gnum_numtheory.a: $(gnum_numtheory_la_OBJECTS) $(gnum_numtheory_la_DEPENDENCIES) - $(LINK) -rpath $(gnumeric_plugindir) $(gnum_numtheory_la_LDFLAGS) $(gnum_numtheory_la_OBJECTS) $(gnum_numtheory_la_LIBADD) $(LIBS) - - tags: TAGS diff --git a/math/gnumeric/pkg/PLIST b/math/gnumeric/pkg/PLIST index 6fdc87a1b95b..f28507605c02 100644 --- a/math/gnumeric/pkg/PLIST +++ b/math/gnumeric/pkg/PLIST @@ -1,19 +1,50 @@ -@comment $NetBSD: PLIST,v 1.10 2000/05/30 09:16:12 rh Exp $ +@comment $NetBSD: PLIST,v 1.11 2000/06/01 12:08:02 rh Exp $ +bin/libole2-config bin/gnumeric etc/CORBA/servers/gnumeric.gnorba etc/CORBA/servers/graph.gnorba +include/libole2/libole2.h +include/libole2/ms-ole.h +include/libole2/ms-ole-summary.h +include/libole2/ms-ole-vba.h +lib/libole2.a lib/gnumericConf.sh -lib/gnumeric/0.53/plugins/gnum_lotus.a -lib/gnumeric/0.53/plugins/gnum_oleo.a -lib/gnumeric/0.53/plugins/gnum_sc.a -lib/gnumeric/0.53/plugins/gnum_sylk.a -lib/gnumeric/0.53/plugins/gnum_text.a -lib/gnumeric/0.53/plugins/gnum_csv.a -lib/gnumeric/0.53/plugins/gnum_xbase.a -lib/gnumeric/0.53/plugins/gnum_html.a -lib/gnumeric/0.53/plugins/gnum_dif.a -lib/gnumeric/0.53/plugins/gnum_sample.a -lib/gnumeric/0.53/plugins/gnum_numtheory.a +lib/libole2.so.0.0 +lib/libole2.la +lib/libole2Conf.sh +lib/gnumeric/0.54/plugins/libgnum_lotus.so.0.0 +lib/gnumeric/0.54/plugins/gnum_lotus.la +lib/gnumeric/0.54/plugins/libgnum_lotus.a +lib/gnumeric/0.54/plugins/libgnum_oleo.so.0.0 +lib/gnumeric/0.54/plugins/gnum_oleo.la +lib/gnumeric/0.54/plugins/libgnum_oleo.a +lib/gnumeric/0.54/plugins/libgnum_sc.so.0.0 +lib/gnumeric/0.54/plugins/gnum_sc.la +lib/gnumeric/0.54/plugins/libgnum_sc.a +lib/gnumeric/0.54/plugins/libgnum_sylk.so.0.0 +lib/gnumeric/0.54/plugins/gnum_sylk.la +lib/gnumeric/0.54/plugins/libgnum_sylk.a +lib/gnumeric/0.54/plugins/libgnum_text.so.0.0 +lib/gnumeric/0.54/plugins/gnum_text.la +lib/gnumeric/0.54/plugins/libgnum_text.a +lib/gnumeric/0.54/plugins/libgnum_csv.so.0.0 +lib/gnumeric/0.54/plugins/gnum_csv.la +lib/gnumeric/0.54/plugins/libgnum_csv.a +lib/gnumeric/0.54/plugins/libgnum_xbase.so.0.0 +lib/gnumeric/0.54/plugins/gnum_xbase.la +lib/gnumeric/0.54/plugins/libgnum_xbase.a +lib/gnumeric/0.54/plugins/libgnum_html.so.0.0 +lib/gnumeric/0.54/plugins/gnum_dif.la +lib/gnumeric/0.54/plugins/gnum_html.la +lib/gnumeric/0.54/plugins/libgnum_html.a +lib/gnumeric/0.54/plugins/libgnum_dif.so.0.0 +lib/gnumeric/0.54/plugins/libgnum_dif.a +lib/gnumeric/0.54/plugins/libgnum_sample.so.0.0 +lib/gnumeric/0.54/plugins/gnum_sample.la +lib/gnumeric/0.54/plugins/libgnum_sample.a +lib/gnumeric/0.54/plugins/libgnum_numtheory.so.0.0 +lib/gnumeric/0.54/plugins/gnum_numtheory.la +lib/gnumeric/0.54/plugins/libgnum_numtheory.a share/locale/cs/LC_MESSAGES/gnumeric.mo share/locale/da/LC_MESSAGES/gnumeric.mo share/locale/de/LC_MESSAGES/gnumeric.mo @@ -39,6 +70,7 @@ share/locale/sv/LC_MESSAGES/gnumeric.mo share/locale/uk/LC_MESSAGES/gnumeric.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo share/locale/en_GB/LC_MESSAGES/gnumeric.mo +share/locale/gl/LC_MESSAGES/gnumeric.mo share/locale/es_DO/LC_MESSAGES/gnumeric.mo share/locale/es_GT/LC_MESSAGES/gnumeric.mo share/locale/es_HN/LC_MESSAGES/gnumeric.mo @@ -47,6 +79,11 @@ share/locale/es_PA/LC_MESSAGES/gnumeric.mo share/locale/es_PE/LC_MESSAGES/gnumeric.mo share/locale/es_SV/LC_MESSAGES/gnumeric.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnumeric.mo +share/aclocal/libole2.m4 +share/aclocal/gnome-libole2.m4 +share/pixmaps/gnome-gnumeric.png +share/pixmaps/gnome-application-x-gnumeric.png +share/pixmaps/gnome-application-x-xls.png share/pixmaps/gnumeric/orient-horizontal.png share/pixmaps/gnumeric/orient-vertical.png share/pixmaps/gnumeric/right-down.png @@ -173,9 +210,6 @@ share/pixmaps/gnumeric/inside_border share/pixmaps/gnumeric/outline_border share/pixmaps/gnumeric/no_border share/pixmaps/gnumeric/stf-druid.png -share/pixmaps/gnome-gnumeric.png -share/pixmaps/gnome-application-x-gnumeric.png -share/pixmaps/gnome-application-x-xls.png share/idl/Graph.idl share/idl/Gnumeric.idl share/gnome/help/gnumeric/C/gnumeric.html @@ -605,48 +639,65 @@ share/gnome/apps/Applications/gnumeric.desktop share/mime-info/gnumeric.keys share/mime-info/gnumeric.mime share/mc/templates/gnumeric.desktop -share/gnumeric/0.53/python/gnumeric_startup.py -share/gnumeric/0.53/python/gnumeric_defs.py -share/gnumeric/0.53/glade/graphics.glade -share/gnumeric/0.53/glade/advanced-filter.glade -share/gnumeric/0.53/glade/analysis-tools.glade -share/gnumeric/0.53/glade/autocorrect.glade -share/gnumeric/0.53/glade/autocorrect-exceptions.glade -share/gnumeric/0.53/glade/autosave.glade -share/gnumeric/0.53/glade/autosave-prompt.glade -share/gnumeric/0.53/glade/col-width.glade -share/gnumeric/0.53/glade/font-sel.glade -share/gnumeric/0.53/glade/hf-config.glade -share/gnumeric/0.53/glade/import.glade -share/gnumeric/0.53/glade/names.glade -share/gnumeric/0.53/glade/print.glade -share/gnumeric/0.53/glade/row-height.glade -share/gnumeric/0.53/glade/sheet-order.glade -share/gnumeric/0.53/glade/sheet-rename.glade -share/gnumeric/0.53/glade/solver.glade -share/gnumeric/0.53/glade/solver-options.glade -share/gnumeric/0.53/glade/summary.glade -share/gnumeric/0.53/glade/dialog-zoom.glade -share/gnumeric/0.53/glade/insert-cells.glade -share/gnumeric/0.53/glade/delete-cells.glade -share/gnumeric/0.53/glade/cell-format.glade -share/gnumeric/0.53/glade/cell-sort.glade -share/gnumeric/0.53/glade/dialog-stf.glade -share/gnumeric/0.53/glade/dialog-stf-export.glade -share/gnumeric/0.53/glade/plugin-manager.glade -share/gnumeric/0.53/glade/function-select.glade -share/gnumeric/0.53/glade/workbook-attr.glade +share/libole2/html/libole2.html +share/libole2/html/libole2-decl.txt +share/libole2/html/libole2-sections.txt +share/libole2/html/libole2/index.html +share/libole2/html/libole2/libole2-common.html +share/libole2/html/libole2/libole2-miscellaneous.html +share/libole2/html/libole2/libole2-msole.html +share/libole2/html/libole2/libole2-msolestream.html +share/libole2/html/libole2/libole2-msolesummary.html +share/libole2/html/libole2/r14.html +share/libole2/html/libole2/r19.html +share/gnumeric/0.54/python/gnumeric_startup.py +share/gnumeric/0.54/python/gnumeric_defs.py +share/gnumeric/0.54/glade/graphics.glade +share/gnumeric/0.54/glade/advanced-filter.glade +share/gnumeric/0.54/glade/analysis-tools.glade +share/gnumeric/0.54/glade/autocorrect.glade +share/gnumeric/0.54/glade/autocorrect-exceptions.glade +share/gnumeric/0.54/glade/autosave.glade +share/gnumeric/0.54/glade/autosave-prompt.glade +share/gnumeric/0.54/glade/col-width.glade +share/gnumeric/0.54/glade/font-sel.glade +share/gnumeric/0.54/glade/hf-config.glade +share/gnumeric/0.54/glade/import.glade +share/gnumeric/0.54/glade/names.glade +share/gnumeric/0.54/glade/print.glade +share/gnumeric/0.54/glade/row-height.glade +share/gnumeric/0.54/glade/sheet-order.glade +share/gnumeric/0.54/glade/sheet-rename.glade +share/gnumeric/0.54/glade/solver.glade +share/gnumeric/0.54/glade/solver-options.glade +share/gnumeric/0.54/glade/summary.glade +share/gnumeric/0.54/glade/dialog-zoom.glade +share/gnumeric/0.54/glade/insert-cells.glade +share/gnumeric/0.54/glade/delete-cells.glade +share/gnumeric/0.54/glade/cell-format.glade +share/gnumeric/0.54/glade/cell-sort.glade +share/gnumeric/0.54/glade/dialog-stf.glade +share/gnumeric/0.54/glade/dialog-stf-export.glade +share/gnumeric/0.54/glade/plugin-manager.glade +share/gnumeric/0.54/glade/function-select.glade +share/gnumeric/0.54/glade/workbook-attr.glade +share/oaf/gnumeric.oafinfo share/oaf/graph.oafinfo -@dirrm lib/gnumeric/0.53/plugins -@dirrm lib/gnumeric/0.53 +@dirrm lib/gnumeric/0.54/plugins +@dirrm lib/gnumeric/0.54 @dirrm lib/gnumeric +@dirrm include/libole2 +@dirrm share/libole2/html/libole2 +@dirrm share/libole2/html +@dirrm share/libole2 +@dirrm share/oaf @dirrm share/pixmaps/gnumeric @dirrm share/gnome/help/gnumeric/C/images @dirrm share/gnome/help/gnumeric/C @dirrm share/gnome/help/gnumeric -@dirrm share/gnumeric/0.53/glade -@dirrm share/gnumeric/0.53/python -@dirrm share/gnumeric/0.53 +@dirrm share/gnumeric/0.54/glade +@dirrm share/gnumeric/0.54/python +@dirrm share/gnumeric/0.54 @dirrm share/gnumeric @unexec rmdir %D/share/mc/templates 2>/dev/null || true @unexec rmdir %D/share/mc 2>/dev/null || true