Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Dec 1999 12:53:45 -0600
From:      Ade Lovett <ade@lovett.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/15816: Update port: math/gnumeric
Message-ID:  <E1247BJ-000DjT-00@anaconda.lovett.com>

next in thread | raw e-mail | index | archive | help

>Number:         15816
>Category:       ports
>Synopsis:       Update port: math/gnumeric
>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:   Fri Dec 31 11:00:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Ade Lovett
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
Lovett Network Consultancy
>Environment:

	Up to date ports tree

>Description:

	Update math/gnumeric to 0.46 - see NEWS and Changelog in the
	source tarball, too much to list here.

	plugins are now moved to a version-dependent subdirectory
	a la emacs and brethren - pretty much every patch had to
	be modified as a result.

	This update also shows up a deficiency in the way we handle
	GNOME ports as a whole (placing some of them in X11BASE, and
	others in LOCALBASE) -- "gnome-config" can't (easily)
	find out about any GNOME ports in LOCALBASE -- I've got a
	simple hack to this which will probably go in on the next
	gnome-libs update, allowing a number of patches in other
	GNOME ports to be removed or substantially cleaned up.
	script 

>How-To-Repeat:

	N/A

>Fix:
	
	Apply following diff:

Version:	0.45 -> 0.46
Changes:	Makefile files/md5 patches/patch-aa patches/patch-af
		patches/patch-bd patches/patch-be patches/patch-bf
		patches/patch-bg patches/patch-bi patches/patch-bj
		patches/patch-bk patches/patch-bl patches/patch-bm
		patches/patch-bo patches/patch-bp patches/patch-bq
		patches/patch-br pkg/PLIST
Adds:		NONE
Removes:	NONE

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	1999/12/24 09:52:29	1.19
+++ Makefile	1999/12/31 18:42:56
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gnumeric
-# Version required:			0.45
+# Version required:			0.46
 # Date created:				08 October 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD: ports/math/gnumeric/Makefile,v 1.19 1999/12/24 09:52:29 nakai Exp $
 #
 
-DISTNAME=	gnumeric-0.45
+DISTNAME=	gnumeric-0.46
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnumeric
@@ -32,5 +32,7 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
+
+PLIST_SUB=	GNUMERIC_REV=${DISTNAME:S/gnumeric-//g}
 
 .include <bsd.port.mk>
cvs diff: Diffing files
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/files/md5,v
retrieving revision 1.12
diff -u -r1.12 md5
--- files/md5	1999/12/24 09:52:33	1.12
+++ files/md5	1999/12/31 17:57:09
@@ -1 +1 @@
-MD5 (gnumeric-0.45.tar.gz) = 7d7308f8d94ea6d3ca0940be78a80e18
+MD5 (gnumeric-0.46.tar.gz) = e873180c7f9cad1004ac75ea57170ed2
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- patches/patch-aa	1999/12/01 10:31:56	1.10
+++ patches/patch-aa	1999/12/31 18:29:45
@@ -1,5 +1,5 @@
---- configure.orig	Fri Nov 19 15:59:10 1999
-+++ configure	Sat Nov 27 14:06:34 1999
+--- configure.orig	Thu Dec 30 18:02:16 1999
++++ configure	Fri Dec 31 12:29:33 1999
 @@ -2790,7 +2790,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
@@ -27,7 +27,7 @@
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -5602,15 +5602,15 @@
+@@ -5602,15 +5602,16 @@
  fi
  
          
@@ -37,7 +37,8 @@
          INSTOBJEXT=.mo
          DATADIRNAME=share
 -	INTLDEPS='$(top_builddir)/intl/libintl.a'
-+	INTLDEPS='-lintl'
++#	INTLDEPS='$(top_builddir)/intl/libintl.a'
++	INTLDEPS="-lintl"
  	INTLLIBS=$INTLDEPS
  	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 -        nls_cv_header_intl=intl/libintl.h
@@ -47,30 +48,34 @@
        fi
  
              if test "$XGETTEXT" != ":"; then
-@@ -6110,7 +6110,7 @@
+@@ -6110,7 +6111,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
++    . `$GNOME_CONFIG --sysconfdir`/printConf.sh
      echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6
  echo "configure:6116: checking for GnomePrint >= 0.8" >&5
      case x$MODULE_VERSION in
-@@ -6125,14 +6125,14 @@
+@@ -6125,8 +6126,8 @@
  
- echo $ac_n "checking for Glade libraries""... $ac_c" 1>&6
- echo "configure:6128: checking for Glade libraries" >&5
+ echo $ac_n "checking for Glade libraries >= 0.11""... $ac_c" 1>&6
+ echo "configure:6128: checking for Glade libraries >= 0.11" >&5
 -if gnome-config --libs libglade > /dev/null 2>&1; then 
+-	vers=`gnome-config --modversion libglade`
 +if libglade-config --libs > /dev/null 2>&1; then 
-     echo "$ac_t""found" 1>&6
- else
++	vers=`libglade-config --version | sed -e 's/ /-/'`
+ 	case $vers
+ 	in
+ 	    libglade-0.1[123456789]) echo "$ac_t""found" 1>&6 ;;
+@@ -6136,8 +6137,8 @@
      { echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; }
  fi
  
 -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`"
++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-af
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- patches/patch-af	1999/08/22 03:59:18	1.2
+++ patches/patch-af	1999/12/31 18:07:10
@@ -1,11 +1,11 @@
---- src/plugin.c.orig	Mon Apr 26 13:20:15 1999
-+++ src/plugin.c	Mon Jul 12 16:49:29 1999
-@@ -123,7 +123,7 @@
- 	g_free (plugin_dir);
+--- src/plugin.c.orig	Thu Dec 30 17:54:14 1999
++++ src/plugin.c	Fri Dec 31 12:06:49 1999
+@@ -156,7 +156,7 @@
+ 	}
  
  	/* Load the system plugins */
--	plugin_dir = gnome_unconditional_libdir_file ("gnumeric/plugins/");
-+	plugin_dir = gnome_unconditional_datadir_file ("gnumeric/plugins/");
+-	plugin_dir = gnome_unconditional_libdir_file ("gnumeric/plugins/" GNUMERIC_VERSION "/");
++	plugin_dir = gnome_unconditional_datadir_file ("gnumeric/plugins/" GNUMERIC_VERSION "/");
  	plugin_load_plugins_in_dir (plugin_dir);
  	g_free (plugin_dir);
  }
Index: patches/patch-bd
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bd,v
retrieving revision 1.2
diff -u -r1.2 patch-bd
--- patches/patch-bd	1999/08/22 03:59:19	1.2
+++ patches/patch-bd	1999/12/31 18:11:25
@@ -1,29 +1,27 @@
---- plugins/guile/Makefile.in.orig	Thu Jan 28 23:53:12 1999
-+++ plugins/guile/Makefile.in	Fri Jan 29 02:31:43 1999
-@@ -144,7 +144,7 @@
+--- plugins/guile/Makefile.in.orig	Thu Dec 30 18:29:22 1999
++++ plugins/guile/Makefile.in	Fri Dec 31 12:08:55 1999
+@@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
 -plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- # CFLAGS += -g -Wall 	\
- # 	-Wshadow             -Wpointer-arith  	\
-@@ -154,7 +154,7 @@
+ plugin_LTLIBRARIES = libgnum_guile.la
  
- libgnumguile_la_SOURCES = plugin.c
+ libgnum_guile_la_SOURCES = plugin.c
  
--INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I$(includedir)						$(GUILE_INCS)						$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I$(includedir)						$(GUILE_INCS)						$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GUILE_INCS)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GUILE_INCS)						$(GNOME_INCLUDEDIR)
  
  
  #libguile_la_LDFLAGS = $(PYTHON_LIB_LOC)
-@@ -180,7 +180,7 @@
+@@ -177,7 +177,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libgnumguile_la_LDFLAGS = 
-+libgnumguile_la_LDFLAGS = -avoid-version
- libgnumguile_la_DEPENDENCIES = 
- libgnumguile_la_OBJECTS =  plugin.lo
+-libgnum_guile_la_LDFLAGS = 
++libgnum_guile_la_LDFLAGS = -avoid-version
+ libgnum_guile_la_DEPENDENCIES = 
+ libgnum_guile_la_OBJECTS =  plugin.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-be
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-be,v
retrieving revision 1.2
diff -u -r1.2 patch-be
--- patches/patch-be	1999/08/22 03:59:20	1.2
+++ patches/patch-be	1999/12/31 18:11:15
@@ -1,24 +1,22 @@
---- plugins/python/Makefile.in.orig	Thu Jan 28 23:53:11 1999
-+++ plugins/python/Makefile.in	Fri Jan 29 02:30:52 1999
-@@ -144,7 +144,7 @@
+--- plugins/python/Makefile.in.orig	Thu Dec 30 18:29:20 1999
++++ plugins/python/Makefile.in	Fri Dec 31 12:10:53 1999
+@@ -153,16 +153,16 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- # CFLAGS += -g -Wall 	\
- # 	-Wshadow             -Wpointer-arith  	\
-@@ -161,10 +161,10 @@
+ plugin_LTLIBRARIES = libgnum_python.la
  
- libpython_la_SOURCES = python.c
+ libgnum_python_la_SOURCES = python.c
  
--INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I$(includedir)						$(PY_CFLAGS)					$(GNOME_INCLUDEDIR)
-+INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/sharelocale"\" 		-I$(includedir)						$(PY_CFLAGS)					$(GNOME_INCLUDEDIR)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(PY_CFLAGS)					$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(PY_CFLAGS)					$(GNOME_INCLUDEDIR)
  
  
--libpython_la_LDFLAGS = $(PY_LIB_LOC)  
-+libpython_la_LDFLAGS = -avoid-version $(PY_LIB_LOC)  
- libpython_la_LIBADD = -l$(PY_LIBS) $(PY_EXTRA_LIBS)
+-libgnum_python_la_LDFLAGS = $(PY_LIB_LOC)  
++libgnum_python_la_LDFLAGS = -avoid-version $(PY_LIB_LOC)  
+ libgnum_python_la_LIBADD = -l$(PY_LIBS) $(PY_EXTRA_LIBS)
  
  Pythonscriptsdir = $(datadir)/gnumeric/python
Index: patches/patch-bf
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bf,v
retrieving revision 1.2
diff -u -r1.2 patch-bf
--- patches/patch-bf	1999/08/22 03:59:20	1.2
+++ patches/patch-bf	1999/12/31 18:12:40
@@ -1,29 +1,29 @@
---- plugins/sample/Makefile.in.orig	Thu Jan 28 23:53:07 1999
-+++ plugins/sample/Makefile.in	Fri Jan 29 02:27:58 1999
-@@ -144,7 +144,7 @@
+--- plugins/sample/Makefile.in.orig	Thu Dec 30 18:28:56 1999
++++ plugins/sample/Makefile.in	Fri Dec 31 12:12:23 1999
+@@ -153,7 +153,7 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- # CFLAGS += -g -Wall 	\
- # 	-Wshadow             -Wpointer-arith  	\
-@@ -154,7 +154,7 @@
+ # NOTE :
+ # The naming convention is very intentional
+@@ -166,7 +166,7 @@
  
- libsample_la_SOURCES = plugin-sample.c
+ libgnum_sample_la_SOURCES = plugin-sample.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)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
-@@ -171,7 +171,7 @@
+@@ -176,7 +176,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libsample_la_LDFLAGS = 
-+libsample_la_LDFLAGS = -avoid-version
- libsample_la_LIBADD = 
- libsample_la_OBJECTS =  plugin-sample.lo
+-libgnum_sample_la_LDFLAGS = 
++libgnum_sample_la_LDFLAGS = -avoid-version
+ libgnum_sample_la_LIBADD = 
+ libgnum_sample_la_OBJECTS =  plugin-sample.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bg
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bg,v
retrieving revision 1.2
diff -u -r1.2 patch-bg
--- patches/patch-bg	1999/08/22 03:59:20	1.2
+++ patches/patch-bg	1999/12/31 18:22:23
@@ -1,29 +1,27 @@
---- plugins/stat/Makefile.in.orig	Thu Jan 28 23:53:08 1999
-+++ plugins/stat/Makefile.in	Fri Jan 29 02:29:02 1999
-@@ -143,7 +143,7 @@
+--- plugins/stat/Makefile.in.orig	Thu Dec 30 18:28:58 1999
++++ plugins/stat/Makefile.in	Fri Dec 31 12:22:06 1999
+@@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- CFLAGS = @CFLAGS@ -g -Wall 		-Wshadow             -Wpointer-arith  		-Wmissing-prototypes -Wmissing-declarations 
+ plugin_LTLIBRARIES = libgnum_stat.la
  
-@@ -152,7 +152,7 @@
+ libgnum_stat_la_SOURCES = stat.c stat.h
  
- libstat_la_SOURCES = stat.c stat.h
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
--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
-@@ -167,7 +167,7 @@
+@@ -169,7 +169,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libstat_la_LDFLAGS = 
-+libstat_la_LDFLAGS = -avoid-version
- libstat_la_LIBADD = 
- libstat_la_OBJECTS =  stat.lo
+-libgnum_stat_la_LDFLAGS = 
++libgnum_stat_la_LDFLAGS = -avoid-version
+ libgnum_stat_la_LIBADD = 
+ libgnum_stat_la_OBJECTS =  stat.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bi
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bi,v
retrieving revision 1.4
diff -u -r1.4 patch-bi
--- patches/patch-bi	1999/08/22 03:59:21	1.4
+++ patches/patch-bi	1999/12/31 18:15:07
@@ -1,29 +1,27 @@
---- plugins/text/Makefile.in.orig	Thu May  6 10:57:43 1999
-+++ plugins/text/Makefile.in	Thu May  6 10:58:09 1999
-@@ -154,7 +154,7 @@
+--- plugins/text/Makefile.in.orig	Thu Dec 30 18:29:13 1999
++++ plugins/text/Makefile.in	Fri Dec 31 12:14:37 1999
+@@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- CFLAGS = @CFLAGS@ -g -Wall 		             -Wpointer-arith  		-Wmissing-prototypes -Wmissing-declarations 
+ plugin_LTLIBRARIES = libgnum_text.la
  
-@@ -163,7 +163,7 @@
+ libgnum_text_la_SOURCES = text-io.h text-io.c
  
- libtext_la_SOURCES = text-io.h text-io.c
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
--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@
--libtext_la_LDFLAGS = 
-+libtext_la_LDFLAGS = -avoid-version
- libtext_la_LIBADD = 
- libtext_la_OBJECTS =  text-io.lo
+-libgnum_text_la_LDFLAGS = 
++libgnum_text_la_LDFLAGS = -avoid-version
+ libgnum_text_la_LIBADD = 
+ libgnum_text_la_OBJECTS =  text-io.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bj
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bj,v
retrieving revision 1.2
diff -u -r1.2 patch-bj
--- patches/patch-bj	1999/08/22 03:59:21	1.2
+++ patches/patch-bj	1999/12/31 18:24:18
@@ -1,29 +1,27 @@
---- plugins/ff-csv/Makefile.in.orig	Thu May  6 10:59:32 1999
-+++ plugins/ff-csv/Makefile.in	Thu May  6 10:59:57 1999
-@@ -154,7 +154,7 @@
+--- plugins/ff-csv/Makefile.in.orig	Thu Dec 30 18:29:12 1999
++++ plugins/ff-csv/Makefile.in	Fri Dec 31 12:24:02 1999
+@@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- CFLAGS = @CFLAGS@ -g -Wall 		-Wshadow             -Wpointer-arith  		-Wmissing-prototypes -Wmissing-declarations 
+ plugin_LTLIBRARIES = libgnum_csv.la
  
-@@ -163,7 +163,7 @@
+ libgnum_csv_la_SOURCES = csv-io.h csv-io.c
  
- libcsv_la_SOURCES = csv-io.h csv-io.c
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
--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@
--libcsv_la_LDFLAGS = 
-+libcsv_la_LDFLAGS = -avoid-version
- libcsv_la_LIBADD = 
- libcsv_la_OBJECTS =  csv-io.lo libcsv.lo
+-libgnum_csv_la_LDFLAGS = 
++libgnum_csv_la_LDFLAGS = -avoid-version
+ libgnum_csv_la_LIBADD = 
+ libgnum_csv_la_OBJECTS =  csv-io.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bk
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bk,v
retrieving revision 1.2
diff -u -r1.2 patch-bk
--- patches/patch-bk	1999/08/22 03:59:21	1.2
+++ patches/patch-bk	1999/12/31 18:16:49
@@ -1,28 +1,28 @@
---- plugins/html/Makefile.in.orig	Tue Jul 13 05:53:41 1999
-+++ plugins/html/Makefile.in	Fri Jul 16 00:26:36 1999
-@@ -151,14 +151,14 @@
+--- plugins/html/Makefile.in.orig	Thu Dec 30 18:29:17 1999
++++ plugins/html/Makefile.in	Fri Dec 31 12:16:36 1999
+@@ -153,14 +153,14 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = libhtml.la
+ plugin_LTLIBRARIES = libgnum_html.la
  
- libhtml_la_SOURCES = boot.h boot.c html.h html.c latex.h latex.c 				roff.h roff.c font.h font.c epsf.h epsf.c ps.h ps.c
+ libgnum_html_la_SOURCES = boot.h boot.c html.h html.c latex.h latex.c 				roff.h roff.c font.h font.c epsf.h epsf.c ps.h ps.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)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
  
  EXTRA_DIST = README ChangeLog
-@@ -170,7 +170,7 @@
+@@ -172,7 +172,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libhtml_la_LDFLAGS = 
-+libhtml_la_LDFLAGS = -avoid-version
- libhtml_la_LIBADD = 
- libhtml_la_OBJECTS =  boot.lo html.lo latex.lo roff.lo font.lo epsf.lo \
- ps.lo
+-libgnum_html_la_LDFLAGS = 
++libgnum_html_la_LDFLAGS = -avoid-version
+ libgnum_html_la_LIBADD = 
+ libgnum_html_la_OBJECTS =  boot.lo html.lo latex.lo roff.lo font.lo \
+ epsf.lo ps.lo
Index: patches/patch-bl
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bl,v
retrieving revision 1.1
diff -u -r1.1 patch-bl
--- patches/patch-bl	1999/08/22 03:59:21	1.1
+++ patches/patch-bl	1999/12/31 18:17:43
@@ -1,6 +1,6 @@
---- plugins/xbase/Makefile.in.orig	Fri Jul  9 22:17:53 1999
-+++ plugins/xbase/Makefile.in	Thu Jul 15 09:30:16 1999
-@@ -142,10 +142,10 @@
+--- plugins/xbase/Makefile.in.orig	Thu Dec 30 18:29:15 1999
++++ plugins/xbase/Makefile.in	Fri Dec 31 12:17:28 1999
+@@ -144,10 +144,10 @@
  
  GNUMERIC_SRC_DIR = $(top_srcdir)/src
  
@@ -8,17 +8,17 @@
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"			-I$(includedir)				 		-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
  
  
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = libxbase.la
-
-@@ -159,7 +159,7 @@
+ plugin_LTLIBRARIES = libgnum_xbase.la
  
+@@ -161,7 +161,7 @@
+ 
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libxbase_la_LDFLAGS = 
-+libxbase_la_LDFLAGS = -avoid-version
- libxbase_la_LIBADD = 
- libxbase_la_OBJECTS =  boot.lo xbase.lo
+-libgnum_xbase_la_LDFLAGS = 
++libgnum_xbase_la_LDFLAGS = -avoid-version
+ libgnum_xbase_la_LIBADD = 
+ libgnum_xbase_la_OBJECTS =  boot.lo xbase.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bm
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bm,v
retrieving revision 1.1
diff -u -r1.1 patch-bm
--- patches/patch-bm	1999/10/14 09:20:36	1.1
+++ patches/patch-bm	1999/12/31 18:18:28
@@ -1,6 +1,6 @@
---- plugins/lotus-123/Makefile.in.orig	Thu Sep 23 17:57:08 1999
-+++ plugins/lotus-123/Makefile.in	Fri Sep 24 14:50:07 1999
-@@ -142,10 +142,10 @@
+--- plugins/lotus-123/Makefile.in.orig	Thu Dec 30 18:29:05 1999
++++ plugins/lotus-123/Makefile.in	Fri Dec 31 12:18:15 1999
+@@ -144,10 +144,10 @@
  
  GNUMERIC_SRC_DIR = $(top_srcdir)/src
  
@@ -8,18 +8,17 @@
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"			-I$(includedir)				 		-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
  
  
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = liblotus.la
+ plugin_LTLIBRARIES = libgnum_lotus.la
  
-@@ -159,7 +159,7 @@
+@@ -161,7 +161,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--liblotus_la_LDFLAGS = 
-+liblotus_la_LDFLAGS = -avoid-version
- liblotus_la_LIBADD = 
- liblotus_la_OBJECTS =  boot.lo lotus.lo lotus-formula.lo
+-libgnum_lotus_la_LDFLAGS = 
++libgnum_lotus_la_LDFLAGS = -avoid-version
+ libgnum_lotus_la_LIBADD = 
+ libgnum_lotus_la_OBJECTS =  boot.lo lotus.lo lotus-formula.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-
Index: patches/patch-bo
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bo,v
retrieving revision 1.1
diff -u -r1.1 patch-bo
--- patches/patch-bo	1999/12/01 10:31:57	1.1
+++ patches/patch-bo	1999/12/31 18:19:06
@@ -1,5 +1,5 @@
---- plugins/oleo/Makefile.in.orig	Fri Nov 19 19:48:08 1999
-+++ plugins/oleo/Makefile.in	Sat Nov 27 14:09:37 1999
+--- plugins/oleo/Makefile.in.orig	Thu Dec 30 18:29:07 1999
++++ plugins/oleo/Makefile.in	Fri Dec 31 12:18:53 1999
 @@ -144,10 +144,10 @@
  
  GNUMERIC_SRC_DIR = $(top_srcdir)/src
@@ -8,17 +8,17 @@
 +INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"			-I$(includedir)				 		-I$(top_srcdir)/src					$(GNOME_INCLUDEDIR)
  
  
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = liboleo.la
+ plugin_LTLIBRARIES = libgnum_oleo.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
+-libgnum_oleo_la_LDFLAGS = 
++libgnum_oleo_la_LDFLAGS = -avoid-version
+ libgnum_oleo_la_LIBADD = 
+ libgnum_oleo_la_OBJECTS =  boot.lo oleo.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bp
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bp,v
retrieving revision 1.1
diff -u -r1.1 patch-bp
--- patches/patch-bp	1999/12/01 10:31:57	1.1
+++ patches/patch-bp	1999/12/31 18:19:51
@@ -1,18 +1,18 @@
---- plugins/sylk/Makefile.in.orig	Fri Nov 19 19:48:09 1999
-+++ plugins/sylk/Makefile.in	Sat Nov 27 14:11:01 1999
+--- plugins/sylk/Makefile.in.orig	Thu Dec 30 18:29:10 1999
++++ plugins/sylk/Makefile.in	Fri Dec 31 12:19:36 1999
 @@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = libsylk.la
+ plugin_LTLIBRARIES = libgnum_sylk.la
  
- libsylk_la_SOURCES = sylk.c
+ libgnum_sylk_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)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
@@ -20,8 +20,8 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libsylk_la_LDFLAGS = 
-+libsylk_la_LDFLAGS = -avoid-version
- libsylk_la_LIBADD = 
- libsylk_la_OBJECTS =  sylk.lo
+-libgnum_sylk_la_LDFLAGS = 
++libgnum_sylk_la_LDFLAGS = -avoid-version
+ libgnum_sylk_la_LIBADD = 
+ libgnum_sylk_la_OBJECTS =  sylk.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-bq
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-bq,v
retrieving revision 1.1
diff -u -r1.1 patch-bq
--- patches/patch-bq	1999/12/24 09:52:37	1.1
+++ patches/patch-bq	1999/12/31 18:20:31
@@ -1,18 +1,18 @@
---- plugins/sc/Makefile.in.orig	Fri Dec  3 21:55:34 1999
-+++ plugins/sc/Makefile.in	Tue Dec  7 12:35:49 1999
+--- plugins/sc/Makefile.in.orig	Thu Dec 30 18:29:09 1999
++++ plugins/sc/Makefile.in	Fri Dec 31 12:20:17 1999
 @@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = libsc.la
+ plugin_LTLIBRARIES = libgnum_sc.la
  
- libsc_la_SOURCES = sc.c
+ libgnum_sc_la_SOURCES = sc.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)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
@@ -20,8 +20,8 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libsc_la_LDFLAGS = 
-+libsc_la_LDFLAGS = -avoid-version
- libsc_la_LIBADD = 
- libsc_la_OBJECTS =  sc.lo
+-libgnum_sc_la_LDFLAGS = 
++libgnum_sc_la_LDFLAGS = -avoid-version
+ libgnum_sc_la_LIBADD = 
+ libgnum_sc_la_OBJECTS =  sc.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-br
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/patches/patch-br,v
retrieving revision 1.1
diff -u -r1.1 patch-br
--- patches/patch-br	1999/12/24 09:52:37	1.1
+++ patches/patch-br	1999/12/31 18:21:11
@@ -1,18 +1,18 @@
---- plugins/dif/Makefile.in.orig	Fri Dec  3 21:55:45 1999
-+++ plugins/dif/Makefile.in	Tue Dec  7 12:36:58 1999
+--- plugins/dif/Makefile.in.orig	Thu Dec 30 18:29:19 1999
++++ plugins/dif/Makefile.in	Fri Dec 31 12:20:58 1999
 @@ -153,13 +153,13 @@
  #
  # Where to install the plugin
  #
--plugindir = $(libdir)/gnumeric/plugins
-+plugindir = $(datadir)/gnumeric/plugins
+-plugindir = $(libdir)/gnumeric/plugins/$(VERSION)
++plugindir = $(datadir)/gnumeric/plugins/$(VERSION)
  
- plugin_LTLIBRARIES = libdif.la
+ plugin_LTLIBRARIES = libgnum_dif.la
  
- libdif_la_SOURCES = dif.h dif.c
+ libgnum_dif_la_SOURCES = dif.h dif.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)
+-INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
++INCLUDES =  	-I$(GNUMERIC_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DGNUMERIC_VERSION=\""$(VERSION)"\"             	-I$(includedir)						$(GNOME_INCLUDEDIR)
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h
@@ -20,8 +20,8 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
--libdif_la_LDFLAGS = 
-+libdif_la_LDFLAGS = -avoid-version
- libdif_la_LIBADD = 
- libdif_la_OBJECTS =  dif.lo
+-libgnum_dif_la_LDFLAGS = 
++libgnum_dif_la_LDFLAGS = -avoid-version
+ libgnum_dif_la_LIBADD = 
+ libgnum_dif_la_OBJECTS =  dif.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
cvs diff: Diffing pkg
Index: pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST	1999/12/24 09:52:43	1.10
+++ pkg/PLIST	1999/12/31 18:44:46
@@ -15,19 +15,20 @@
 share/gnome/gnumeric/glade/row-height.glade
 share/gnome/gnumeric/glade/sheet-rename.glade
 share/gnome/gnumeric/glade/summary.glade
+share/gnome/gnumeric/guile/functions.scm
 share/gnome/gnumeric/guile/gnumeric_startup.scm
-share/gnome/gnumeric/plugins/libcsv.so
-share/gnome/gnumeric/plugins/libdif.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/libsc.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/plugins/%%GNUMERIC_REV%%/libgnum_csv.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_dif.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_guile.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_html.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_lotus.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_oleo.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_python.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sc.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_stat.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_sylk.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_text.so
+share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/libgnum_xbase.so
 share/gnome/gnumeric/python/gnumeric_startup.py
 share/gnome/idl/Gnumeric.idl
 share/gnome/idl/Gnumeric-value.idl
@@ -183,9 +184,11 @@
 share/locale/ru/LC_MESSAGES/gnumeric.mo
 share/locale/sk/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
+share/locale/uk/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnome/gnumeric/guile
 @dirrm share/gnome/gnumeric/glade
+@dirrm share/gnome/gnumeric/plugins/%%GNUMERIC_REV%%/
 @dirrm share/gnome/gnumeric/plugins
 @dirrm share/gnome/gnumeric/python
 @dirrm share/gnome/gnumeric


>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?E1247BJ-000DjT-00>