Date: Sat, 27 Nov 1999 14:43:09 -0600 From: Ade Lovett <ade@lovett.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15122: Update math/gnumeric to 0.44 Message-ID: <E11rogX-0000c3-00@anaconda.lovett.com>
next in thread | raw e-mail | index | archive | help
>Number: 15122
>Category: ports
>Synopsis: Update math/gnumeric to 0.44
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 27 12:50:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Ade Lovett
>Release: FreeBSD 3.3-STABLE i386
>Organization:
Lovett Network Consultancy
>Environment:
Up to date ports tree.
>Description:
Update math/gnumeric to 0.44
Note:
GUILE support has been forcibly removed, since it is currently
suffering from extreme bit-rot (the rest of gnumeric has changed
so as to make this plugin uncompilable).
>How-To-Repeat:
N/A
>Fix:
Apply following patch:
Version: 0.41 -> 0.44
Changes: Makefile files/md5 patches/patch-aa patches/patch-bh
pkg/PLIST
Adds: patches/patch-bo patches/patch-bp
Removes: NONE
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 1999/10/27 10:26:29 1.16
+++ Makefile 1999/11/27 20:00:59
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnumeric
-# Version required: 0.41
+# Version required: 0.44
# Date created: 08 October 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD: ports/math/gnumeric/Makefile,v 1.16 1999/10/27 10:26:29 nakai Exp $
#
-DISTNAME= gnumeric-0.41
+DISTNAME= gnumeric-0.44
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnumeric
cvs diff: Diffing files
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/files/md5,v
retrieving revision 1.10
diff -u -r1.10 md5
--- md5 1999/10/27 10:26:33 1.10
+++ md5 1999/11/27 20:01:04
@@ -1 +1 @@
-MD5 (gnumeric-0.41.tar.gz) = 1b03122ce3755c1841434b6723355670
+MD5 (gnumeric-0.44.tar.gz) = 403492503ca0f9be56d676cc0a728514
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-aa,v
retrieving revision 1.9
diff -u -r1.9 patch-aa
--- patch-aa 1999/10/27 10:26:36 1.9
+++ patch-aa 1999/11/27 20:06:57
@@ -1,6 +1,6 @@
---- configure.orig Tue Oct 19 09:12:29 1999
-+++ configure Wed Oct 20 11:59:28 1999
-@@ -2788,7 +2788,7 @@
+--- configure.orig Fri Nov 19 15:59:10 1999
++++ configure Sat Nov 27 14:06:34 1999
+@@ -2790,7 +2790,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -9,25 +9,25 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -3333,7 +3333,7 @@
+@@ -3335,7 +3335,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
+LIBS="`xml-config --libs` $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 3339 "configure"
+ #line 3341 "configure"
#include "confdefs.h"
-@@ -3364,7 +3364,7 @@
+@@ -3365,7 +3365,7 @@
+ echo "$ac_t""yes" 1>&6
-
- GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
+ GNOME_XML_LIB=`xml-config --libs`
else
echo "$ac_t""no" 1>&6
-@@ -5600,15 +5600,15 @@
+@@ -5602,15 +5602,15 @@
fi
@@ -47,19 +47,19 @@
fi
if test "$XGETTEXT" != ":"; then
-@@ -6056,7 +6056,7 @@
- echo "configure:6057: checking for GnomePrint libraries" >&5
+@@ -6110,7 +6110,7 @@
+ echo "configure:6111: checking for GnomePrint libraries" >&5
if gnome-config --libs print > /dev/null 2>&1; then
echo "$ac_t""found" 1>&6
- . `gnome-config --libdir`/printConf.sh
+ . `gnome-config --sysconfdir`/printConf.sh
echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6
- echo "configure:6062: checking for GnomePrint >= 0.8" >&5
+ echo "configure:6116: checking for GnomePrint >= 0.8" >&5
case x$MODULE_VERSION in
-@@ -6071,14 +6071,14 @@
+@@ -6125,14 +6125,14 @@
echo $ac_n "checking for Glade libraries""... $ac_c" 1>&6
- echo "configure:6074: checking for Glade libraries" >&5
+ echo "configure:6128: checking for Glade libraries" >&5
-if gnome-config --libs libglade > /dev/null 2>&1; then
+if libglade-config --libs > /dev/null 2>&1; then
echo "$ac_t""found" 1>&6
@@ -67,10 +67,10 @@
{ echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; }
fi
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo`
-+EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print $bonobo` `libglade-config --libs gnome`"
-+EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print $bonobo` `libglade-config --cflags gnome`"
+-EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo $gb`
+-EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo $gb`
++EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print $bonobo $gb` `libglade-config --libs gnome`"
++EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print $bonobo $gb` `libglade-config --cflags gnome`"
Index: patches/patch-bh
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bh,v
retrieving revision 1.3
diff -u -r1.3 patch-bh
--- patch-bh 1999/10/14 09:20:36 1.3
+++ patch-bh 1999/11/27 20:24:09
@@ -1,11 +1,11 @@
---- plugins/Makefile.in.orig Thu Sep 23 17:56:49 1999
-+++ plugins/Makefile.in Fri Sep 24 14:48:24 1999
-@@ -148,7 +148,7 @@
+--- plugins/Makefile.in.orig Fri Nov 19 19:47:55 1999
++++ plugins/Makefile.in Sat Nov 27 14:07:59 1999
+@@ -150,7 +150,7 @@
#SUBDIRS = sample stat excel ff-csv text $(PYTHON) $(PERL) $(GUILE_DIR) xbase
--SUBDIRS = sample stat excel lotus-123 ff-csv text xbase html $(PYTHON) $(GUILE_DIR)
-+SUBDIRS = stat excel lotus-123 ff-csv text xbase html $(PYTHON) $(GUILE_DIR)
+-SUBDIRS = sample stat excel lotus-123 oleo sylk ff-csv text xbase html $(PYTHON) $(GUILE_DIR)
++SUBDIRS = stat excel lotus-123 oleo sylk ff-csv text xbase html $(PYTHON) # $(GUILE_DIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST 1999/10/27 10:26:39 1.8
+++ PLIST 1999/11/27 20:33:18
@@ -1,6 +1,8 @@
bin/gnumeric
etc/CORBA/servers/gnumeric.gnorba
share/gnome/apps/Applications/gnumeric.desktop
+share/gnome/gnumeric/glade/cell-format.glade
+share/gnome/gnumeric/glade/cell-sort.glade
share/gnome/gnumeric/glade/col-width.glade
share/gnome/gnumeric/glade/delete-cells.glade
share/gnome/gnumeric/glade/dialog-zoom.glade
@@ -13,13 +15,13 @@
share/gnome/gnumeric/glade/row-height.glade
share/gnome/gnumeric/glade/sheet-rename.glade
share/gnome/gnumeric/glade/summary.glade
-share/gnome/gnumeric/guile/gnumeric_startup.scm
share/gnome/gnumeric/plugins/libcsv.so
-share/gnome/gnumeric/plugins/libgnumguile.so
share/gnome/gnumeric/plugins/libhtml.so
share/gnome/gnumeric/plugins/liblotus.so
+share/gnome/gnumeric/plugins/liboleo.so
share/gnome/gnumeric/plugins/libpython.so
share/gnome/gnumeric/plugins/libstat.so
+share/gnome/gnumeric/plugins/libsylk.so
share/gnome/gnumeric/plugins/libtext.so
share/gnome/gnumeric/plugins/libxbase.so
share/gnome/gnumeric/python/gnumeric_startup.py
@@ -30,6 +32,7 @@
share/gnome/mime-info/gnumeric.mime
share/gnome/pixmaps/gnome-gnumeric-xl.png
share/gnome/pixmaps/gnome-gnumeric.png
+share/gnome/pixmaps/gnumeric/bottom_border
share/gnome/pixmaps/gnumeric/chart_area_1_1.png
share/gnome/pixmaps/gnumeric/chart_area_1_2.png
share/gnome/pixmaps/gnumeric/chart_area_1_3.png
@@ -103,10 +106,51 @@
share/gnome/pixmaps/gnumeric/chart_surface_1_2.png
share/gnome/pixmaps/gnumeric/chart_surface_2_1.png
share/gnome/pixmaps/gnumeric/chart_surface_2_2.png
+share/gnome/pixmaps/gnumeric/diag_border
share/gnome/pixmaps/gnumeric/down-right.png
+share/gnome/pixmaps/gnumeric/gp_125grey
+share/gnome/pixmaps/gnumeric/gp_25grey
+share/gnome/pixmaps/gnumeric/gp_50grey
+share/gnome/pixmaps/gnumeric/gp_625grey
+share/gnome/pixmaps/gnumeric/gp_75grey
+share/gnome/pixmaps/gnumeric/gp_diag
+share/gnome/pixmaps/gnumeric/gp_diag_cross
+share/gnome/pixmaps/gnumeric/gp_horiz
+share/gnome/pixmaps/gnumeric/gp_rev_diag
+share/gnome/pixmaps/gnumeric/gp_solid
+share/gnome/pixmaps/gnumeric/gp_thick_diag_cross
+share/gnome/pixmaps/gnumeric/gp_thin_diag
+share/gnome/pixmaps/gnumeric/gp_thin_diag_cross
+share/gnome/pixmaps/gnumeric/gp_thin_horiz
+share/gnome/pixmaps/gnumeric/gp_thin_horiz_cross
+share/gnome/pixmaps/gnumeric/gp_thin_rev_diag
+share/gnome/pixmaps/gnumeric/gp_thin_vert
+share/gnome/pixmaps/gnumeric/gp_vert
+share/gnome/pixmaps/gnumeric/inside_border
+share/gnome/pixmaps/gnumeric/inside_horiz_border
+share/gnome/pixmaps/gnumeric/inside_vert_border
+share/gnome/pixmaps/gnumeric/left_border
+share/gnome/pixmaps/gnumeric/line_pattern_dash_dot
+share/gnome/pixmaps/gnumeric/line_pattern_dash_dot_dot
+share/gnome/pixmaps/gnumeric/line_pattern_dashed
+share/gnome/pixmaps/gnumeric/line_pattern_dotted
+share/gnome/pixmaps/gnumeric/line_pattern_double
+share/gnome/pixmaps/gnumeric/line_pattern_hair
+share/gnome/pixmaps/gnumeric/line_pattern_medium
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash_dot
+share/gnome/pixmaps/gnumeric/line_pattern_medium_dash_dot_dot
+share/gnome/pixmaps/gnumeric/line_pattern_slant
+share/gnome/pixmaps/gnumeric/line_pattern_thick
+share/gnome/pixmaps/gnumeric/line_pattern_thin
+share/gnome/pixmaps/gnumeric/no_border
share/gnome/pixmaps/gnumeric/orient-horizontal.png
share/gnome/pixmaps/gnumeric/orient-vertical.png
+share/gnome/pixmaps/gnumeric/outline_border
+share/gnome/pixmaps/gnumeric/rev_diag_border
share/gnome/pixmaps/gnumeric/right-down.png
+share/gnome/pixmaps/gnumeric/right_border
+share/gnome/pixmaps/gnumeric/top_border
share/locale/cs/LC_MESSAGES/gnumeric.mo
share/locale/da/LC_MESSAGES/gnumeric.mo
share/locale/de/LC_MESSAGES/gnumeric.mo
@@ -139,6 +183,5 @@
@dirrm share/gnome/pixmaps/gnumeric
@dirrm share/gnome/gnumeric/python
@dirrm share/gnome/gnumeric/plugins
-@dirrm share/gnome/gnumeric/guile
@dirrm share/gnome/gnumeric/glade
@dirrm share/gnome/gnumeric
--- /dev/null Sat Nov 27 14:34:18 1999
+++ patches/patch-bo Sat Nov 27 14:10:19 1999
@@ -0,0 +1,24 @@
+--- plugins/oleo/Makefile.in.orig Fri Nov 19 19:48:08 1999
++++ plugins/oleo/Makefile.in Sat Nov 27 14:09:37 1999
+@@ -144,10 +144,10 @@
+
+ GNUMERIC_SRC_DIR = $(top_srcdir)/src
+
+-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNUMERIC_VERSION=\""$(VERSION)"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR)
++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNUMERIC_VERSION=\""$(VERSION)"\" -I$(includedir) -I$(top_srcdir)/src $(GNOME_INCLUDEDIR)
+
+
+-plugindir = $(libdir)/gnumeric/plugins
++plugindir = $(datadir)/gnumeric/plugins
+
+ plugin_LTLIBRARIES = liboleo.la
+
+@@ -161,7 +161,7 @@
+
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-liboleo_la_LDFLAGS =
++liboleo_la_LDFLAGS = -avoid-version
+ liboleo_la_LIBADD =
+ liboleo_la_OBJECTS = boot.lo oleo.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- /dev/null Sat Nov 27 14:34:18 1999
+++ patches/patch-bp Sat Nov 27 14:11:44 1999
@@ -0,0 +1,27 @@
+--- plugins/sylk/Makefile.in.orig Fri Nov 19 19:48:09 1999
++++ plugins/sylk/Makefile.in Sat Nov 27 14:11:01 1999
+@@ -153,13 +153,13 @@
+ #
+ # Where to install the plugin
+ #
+-plugindir = $(libdir)/gnumeric/plugins
++plugindir = $(datadir)/gnumeric/plugins
+
+ plugin_LTLIBRARIES = libsylk.la
+
+ libsylk_la_SOURCES = sylk.c
+
+-INCLUDES = -I$(GNUMERIC_SRC_DIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES = -I$(GNUMERIC_SRC_DIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+@@ -169,7 +169,7 @@
+
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libsylk_la_LDFLAGS =
++libsylk_la_LDFLAGS = -avoid-version
+ libsylk_la_LIBADD =
+ libsylk_la_OBJECTS = sylk.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E11rogX-0000c3-00>