Skip to content

Instantly share code, notes, and snippets.

@lichray

lichray/gnumeric_all_in_one.patch

Created February 17, 2012 02:14
Show Gist options
  • Save lichray/1849866 to your computer and use it in GitHub Desktop.
Save lichray/1849866 to your computer and use it in GitHub Desktop.
Download ZIP
Upgrade Gnumeric to 1.11.1
Raw
gnumeric_all_in_one.patch
diff -ruN --exclude=CVS /usr/ports/devel/libgsf.orig/Makefile /usr/ports/devel/libgsf/Makefile
--- /usr/ports/devel/libgsf.orig/Makefile 2011-11-06 22:24:51.000000000 -0600
+++ /usr/ports/devel/libgsf/Makefile 2012-02-16 09:57:40.190157000 -0600
@@ -7,7 +7,7 @@
#
PORTNAME= libgsf
-PORTVERSION= 1.14.21
+PORTVERSION= 1.14.22
PORTREVISION?= 0
CATEGORIES?= devel
MASTER_SITES= GNOME
@@ -20,14 +20,13 @@
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
-USE_BZIP2= yes
+USE_XZ= yes
USE_GMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack
USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \
- --without-bonobo
+CONFIGURE_ARGS?=--without-python --with-gio
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -35,14 +34,4 @@
MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1
.endif
-.if !defined(WITHOUT_GCONF) || exists(${LOCALBASE}/bin/gconftool-2)
-USE_GNOME+= gconf2
-PLIST_SUB+= THUMB=""
-. if !defined(GSF_SLAVE)
-GCONF_SCHEMAS= gsf-office-thumbnailer.schemas
-. endif
-.else
-PLIST_SUB+= THUMB="@comment "
-.endif
-
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/devel/libgsf.orig/distinfo /usr/ports/devel/libgsf/distinfo
--- /usr/ports/devel/libgsf.orig/distinfo 2011-06-13 22:30:25.000000000 -0500
+++ /usr/ports/devel/libgsf/distinfo 2012-02-16 09:20:39.383409000 -0600
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgsf-1.14.21.tar.bz2) = eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db
-SIZE (gnome2/libgsf-1.14.21.tar.bz2) = 597463
+SHA256 (gnome2/libgsf-1.14.22.tar.xz) = a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f
+SIZE (gnome2/libgsf-1.14.22.tar.xz) = 506188
diff -ruN --exclude=CVS /usr/ports/devel/libgsf.orig/files/patch-gsf-gnome-Makefile.in /usr/ports/devel/libgsf/files/patch-gsf-gnome-Makefile.in
--- /usr/ports/devel/libgsf.orig/files/patch-gsf-gnome-Makefile.in 2009-01-09 23:21:25.000000000 -0600
+++ /usr/ports/devel/libgsf/files/patch-gsf-gnome-Makefile.in 1969-12-31 18:00:00.000000000 -0600
@@ -1,42 +0,0 @@
---- gsf-gnome/Makefile.in.orig 2008-10-19 22:08:05.000000000 -0500
-+++ gsf-gnome/Makefile.in 2008-10-19 22:12:54.000000000 -0500
-@@ -66,9 +66,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES = \
--@WITH_LIBGSF_GNOME_TRUE@ $(top_builddir)/gsf/libgsf-1.la \
--@WITH_LIBGSF_GNOME_TRUE@ $(am__DEPENDENCIES_1)
-+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_DEPENDENCIES =
- am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \
- gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \
- gsf-shared-bonobo-stream.c
-@@ -298,18 +296,20 @@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS)
- @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la
--@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS)
-+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS)
- @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \
- @WITH_LIBGSF_GNOME_TRUE@ $(VERSION_INFO) $(am__append_1)
- @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \
- @WITH_LIBGSF_GNOME_TRUE@ $(am__append_3)
--libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
--libgsf_gnome_1_include_HEADERS = \
-- gsf-input-gnomevfs.h \
-- gsf-output-gnomevfs.h \
-- gsf-input-bonobo.h \
-- gsf-output-bonobo.h \
-- gsf-shared-bonobo-stream.h
-+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_includedir =
-+@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS =
-+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
-+@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \
-+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \
-+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \
-+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \
-+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \
-+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h
-
- all: all-am
-
diff -ruN --exclude=CVS /usr/ports/devel/libgsf.orig/files/patch-gsf-python-Makefile.in /usr/ports/devel/libgsf/files/patch-gsf-python-Makefile.in
--- /usr/ports/devel/libgsf.orig/files/patch-gsf-python-Makefile.in 2007-09-05 10:50:26.000000000 -0500
+++ /usr/ports/devel/libgsf/files/patch-gsf-python-Makefile.in 2012-02-16 09:31:20.247234000 -0600
@@ -1,7 +1,7 @@
---- python/Makefile.in.orig 2007-09-05 10:35:23.000000000 -0500
-+++ python/Makefile.in 2007-09-05 10:38:00.000000000 -0500
-@@ -55,8 +55,7 @@
- pygsfexecLTLIBRARIES_INSTALL = $(INSTALL)
+--- python/Makefile.in~ 2012-02-16 09:28:31.902991319 -0600
++++ python/Makefile.in 2012-02-16 09:31:06.030877167 -0600
+@@ -74,8 +74,7 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(pygsfexecdir)" "$(DESTDIR)$(pygsfdir)"
LTLIBRARIES = $(pygsfexec_LTLIBRARIES)
am__DEPENDENCIES_1 =
-_gsfmodule_la_DEPENDENCIES = $(top_builddir)/gsf/libgsf-1.la \
@@ -10,29 +10,7 @@
am__gsfmodule_la_OBJECTS = _gsfmodule_la-gsfmodule.lo
nodist__gsfmodule_la_OBJECTS = _gsfmodule_la-gsf.lo
_gsfmodule_la_OBJECTS = $(am__gsfmodule_la_OBJECTS) \
-@@ -64,10 +63,7 @@
- _gsfmodule_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(_gsfmodule_la_CFLAGS) \
- $(CFLAGS) $(_gsfmodule_la_LDFLAGS) $(LDFLAGS) -o $@
--gnomemodule_la_DEPENDENCIES = \
-- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \
-- $(top_builddir)/gsf/libgsf-1.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+gnomemodule_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnomemodule.lo
- nodist_gnomemodule_la_OBJECTS = gnomemodule_la-gsfgnome.lo
- gnomemodule_la_OBJECTS = $(am_gnomemodule_la_OBJECTS) \
-@@ -299,8 +295,7 @@
-
- gnomemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgnome
- gnomemodule_la_LIBADD = \
-- $(top_builddir)/gsf-gnome/libgsf-gnome-1.la \
-- $(top_builddir)/gsf/libgsf-1.la \
-+ -lgsf-1 -lgsf-gnome-1 \
- $(LIBGSF_LIBS) $(LIBGSF_GNOME_LIBS)
-
- gnomemodule_la_SOURCES = gsfgnomemodule.c
-@@ -310,7 +305,7 @@
+@@ -306,7 +305,7 @@ _gsfmodule_la_CFLAGS = \
$(LIBGSF_CFLAGS)
_gsfmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gsf
diff -ruN --exclude=CVS /usr/ports/devel/libgsf.orig/pkg-plist /usr/ports/devel/libgsf/pkg-plist
--- /usr/ports/devel/libgsf.orig/pkg-plist 2011-06-13 22:30:25.000000000 -0500
+++ /usr/ports/devel/libgsf/pkg-plist 2012-02-16 09:56:34.527903000 -0600
@@ -1,5 +1,5 @@
bin/gsf
-%%THUMB%%bin/gsf-office-thumbnailer
+bin/gsf-office-thumbnailer
bin/gsf-vba-dump
include/libgsf-1/gsf/gsf-blob.h
include/libgsf-1/gsf/gsf-clip-data.h
@@ -98,26 +98,30 @@
share/locale/da/LC_MESSAGES/libgsf.mo
share/locale/de/LC_MESSAGES/libgsf.mo
share/locale/en_GB/LC_MESSAGES/libgsf.mo
+share/locale/eo/LC_MESSAGES/libgsf.mo
share/locale/es/LC_MESSAGES/libgsf.mo
share/locale/eu/LC_MESSAGES/libgsf.mo
share/locale/fr/LC_MESSAGES/libgsf.mo
share/locale/gl/LC_MESSAGES/libgsf.mo
+share/locale/id/LC_MESSAGES/libgsf.mo
share/locale/it/LC_MESSAGES/libgsf.mo
share/locale/nb/LC_MESSAGES/libgsf.mo
+share/locale/nn/LC_MESSAGES/libgsf.mo
share/locale/oc/LC_MESSAGES/libgsf.mo
share/locale/pa/LC_MESSAGES/libgsf.mo
share/locale/pl/LC_MESSAGES/libgsf.mo
share/locale/pt/LC_MESSAGES/libgsf.mo
share/locale/pt_BR/LC_MESSAGES/libgsf.mo
+share/locale/ro/LC_MESSAGES/libgsf.mo
+share/locale/ru/LC_MESSAGES/libgsf.mo
share/locale/sl/LC_MESSAGES/libgsf.mo
share/locale/sv/LC_MESSAGES/libgsf.mo
+share/locale/uk/LC_MESSAGES/libgsf.mo
share/locale/zh_CN/LC_MESSAGES/libgsf.mo
share/locale/zh_HK/LC_MESSAGES/libgsf.mo
share/locale/zh_TW/LC_MESSAGES/libgsf.mo
+share/thumbnailers/gsf-office.thumbnailer
+@dirrm share/thumbnailers
@dirrm share/doc/gsf
@dirrm include/libgsf-1/gsf
@dirrm include/libgsf-1
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
diff -ruN --exclude=CVS /usr/ports/devel/py-libgsf.orig/Makefile /usr/ports/devel/py-libgsf/Makefile
--- /usr/ports/devel/py-libgsf.orig/Makefile 2011-09-23 17:22:11.000000000 -0500
+++ /usr/ports/devel/py-libgsf/Makefile 2012-02-16 10:07:24.256328197 -0600
@@ -5,8 +5,8 @@
# $FreeBSD: ports/devel/py-libgsf/Makefile,v 1.7 2011/09/23 22:22:11 amdmi3 Exp $
# $MCom: ports/devel/py-libgsf/Makefile,v 1.1 2006/10/04 00:34:55 ahze Exp $
-PORTREVISION= 4
-CATEGORIES= devel gnome python
+PORTREVISION= 0
+CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= [email protected]
@@ -18,14 +18,13 @@
MASTERDIR= ${.CURDIR}/../libgsf
PLIST= ${.CURDIR}/pkg-plist
-USE_GNOME= gnomehack libgsf_gnome gnomevfs2 ltverhack intlhack pygtk2
+USE_GNOME= gnomehack ltverhack intlhack pygtk2
USE_PYTHON= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \
- --disable-gtk-doc --with-bz2 --with-gnome --with-python
+ --disable-gtk-doc --with-bz2 --with-python
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-GCONF_SCHEMAS=
GSF_SLAVE= yes
.include "${MASTERDIR}/Makefile"
diff -ruN --exclude=CVS /usr/ports/devel/py-libgsf.orig/pkg-plist /usr/ports/devel/py-libgsf/pkg-plist
--- /usr/ports/devel/py-libgsf.orig/pkg-plist 2006-10-14 04:06:29.000000000 -0500
+++ /usr/ports/devel/py-libgsf/pkg-plist 2012-02-16 10:08:24.158475402 -0600
@@ -4,7 +4,4 @@
%%PYTHON_SITELIBDIR%%/gsf/_gsfmodule.a
%%PYTHON_SITELIBDIR%%/gsf/_gsfmodule.la
%%PYTHON_SITELIBDIR%%/gsf/_gsfmodule.so
-%%PYTHON_SITELIBDIR%%/gsf/gnomemodule.a
-%%PYTHON_SITELIBDIR%%/gsf/gnomemodule.la
-%%PYTHON_SITELIBDIR%%/gsf/gnomemodule.so
@dirrm %%PYTHON_SITELIBDIR%%/gsf
diff -ruN --exclude=CVS /usr/ports/devel/goffice.orig/Makefile /usr/ports/devel/goffice/Makefile
--- /usr/ports/devel/goffice.orig/Makefile 2012-02-14 06:45:16.000000000 -0600
+++ /usr/ports/devel/goffice/Makefile 2012-02-16 15:17:30.021842919 -0600
@@ -9,8 +9,7 @@
# math/gnumeric science/gchemutils
PORTNAME= goffice
-PORTVERSION= 0.8.17
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
@@ -31,14 +30,8 @@
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION=${PORTVERSION} \
- SHORT_VER=0.8
+ SHORT_VER=0.10
MAKE_JOBS_SAFE= yes
-.if !defined(WITHOUT_GCONF)
-USE_GNOME+= gconf2
-.else
-CONFIGURE_ARGS+=--with-config-backend=keyfile
-.endif
-
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/devel/goffice.orig/distinfo /usr/ports/devel/goffice/distinfo
--- /usr/ports/devel/goffice.orig/distinfo 2011-11-22 08:46:50.000000000 -0600
+++ /usr/ports/devel/goffice/distinfo 2012-02-16 10:15:01.783083000 -0600
@@ -1,2 +1,2 @@
-SHA256 (goffice-0.8.17.tar.xz) = 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15
-SIZE (goffice-0.8.17.tar.xz) = 1814488
+SHA256 (goffice-0.9.1.tar.xz) = e561ed1c2314f45334ca959e859a3745da5df774cada0ce32499b2914504bb64
+SIZE (goffice-0.9.1.tar.xz) = 1850060
diff -ruN --exclude=CVS /usr/ports/devel/goffice.orig/files/patch-libgoffice.pc.in /usr/ports/devel/goffice/files/patch-libgoffice.pc.in
--- /usr/ports/devel/goffice.orig/files/patch-libgoffice.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/devel/goffice/files/patch-libgoffice.pc.in 2012-02-17 03:29:57.612176441 -0600
@@ -0,0 +1,8 @@
+--- libgoffice.pc.in~ 2011-08-02 18:03:54.000000000 -0500
++++ libgoffice.pc.in 2012-02-17 03:29:26.646577521 -0600
+@@ -11,4 +11,4 @@ Libs: -L${libdir} -lgoffice-@GOFFICE_API
+ Libs.private: @EXTRA_LIBS@
+ Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@
+
+-PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
++PluginDir=${libdir}/goffice/@VERSION@/plugins
diff -ruN --exclude=CVS /usr/ports/devel/goffice.orig/pkg-plist /usr/ports/devel/goffice/pkg-plist
--- /usr/ports/devel/goffice.orig/pkg-plist 2011-11-22 08:46:50.000000000 -0600
+++ /usr/ports/devel/goffice/pkg-plist 2012-02-16 15:25:26.643190469 -0600
@@ -19,9 +19,11 @@
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-arc.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-canvas.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-circle.h
+include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-component.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-ellipse.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-graph.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-group.h
+include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-image.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-item.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-line.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-path.h
@@ -36,24 +38,13 @@
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-widget.h
include/libgoffice-%%SHORT_VER%%/goffice/canvas/goffice-canvas.h
include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-factory.h
+include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-mime-dialog.h
include/libgoffice-%%SHORT_VER%%/goffice/component/go-component.h
include/libgoffice-%%SHORT_VER%%/goffice/component/goffice-component.h
include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-impl.h
include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-simple.h
include/libgoffice-%%SHORT_VER%%/goffice/data/go-data.h
include/libgoffice-%%SHORT_VER%%/goffice/data/goffice-data.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-anchor.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-default-attributes.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-group.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-view.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image-store.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-property-table.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-shape.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-text-model.h
include/libgoffice-%%SHORT_VER%%/goffice/goffice-features.h
include/libgoffice-%%SHORT_VER%%/goffice/goffice.h
include/libgoffice-%%SHORT_VER%%/goffice/graph/goffice-graph.h
@@ -85,6 +76,7 @@
include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-reg-curve.h
include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-renderer.h
include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-impl.h
+include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-labels.h
include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-lines.h
include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series.h
include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-smoothed-curve.h
@@ -117,11 +109,11 @@
include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-optionmenu.h
include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-palette.h
include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pattern-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pixbuf.h
include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-rotation-sel.h
include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-selector.h
include/libgoffice-%%SHORT_VER%%/goffice/gtk/goffice-gtk.h
include/libgoffice-%%SHORT_VER%%/goffice/math/go-R.h
+include/libgoffice-%%SHORT_VER%%/goffice/math/go-accumulator.h
include/libgoffice-%%SHORT_VER%%/goffice/math/go-complex.h
include/libgoffice-%%SHORT_VER%%/goffice/math/go-cspline.h
include/libgoffice-%%SHORT_VER%%/goffice/math/go-distribution.h
@@ -132,15 +124,12 @@
include/libgoffice-%%SHORT_VER%%/goffice/math/go-rangefunc.h
include/libgoffice-%%SHORT_VER%%/goffice/math/go-regression.h
include/libgoffice-%%SHORT_VER%%/goffice/math/goffice-math.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-image-ms.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/datetime.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-bezier.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-cairo.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-color.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-editor.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-emf.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-file.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-font.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-format.h
@@ -156,9 +145,13 @@
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-path.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pattern.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-persist.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pixbuf.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-rsm.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-spectre.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-string.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-style.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-styled-object.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-svg.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-undo.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h
include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h
@@ -231,80 +224,35 @@
lib/libgoffice-%%SHORT_VER%%.a
lib/libgoffice-%%SHORT_VER%%.la
lib/libgoffice-%%SHORT_VER%%.so
-lib/libgoffice-%%SHORT_VER%%.so.8
+lib/libgoffice-%%SHORT_VER%%.so.9
libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc
-%%DOCSDIR%%-%%SHORT_VER%%/GOCalendarButton.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOCharmapSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOCmdContext.html
%%DOCSDIR%%-%%SHORT_VER%%/GOComboBox.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboColor.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboPixmaps.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboText.html
%%DOCSDIR%%-%%SHORT_VER%%/GOComponent.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOData.html
%%DOCSDIR%%-%%SHORT_VER%%/GODataMatrix.html
%%DOCSDIR%%-%%SHORT_VER%%/GODataScalar.html
%%DOCSDIR%%-%%SHORT_VER%%/GODataVector.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODoc.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODocControl.html
%%DOCSDIR%%-%%SHORT_VER%%/GOFileOpener.html
%%DOCSDIR%%-%%SHORT_VER%%/GOFileSaver.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOFontSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOFormatSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOGraphWidget.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOIOContext.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOLocaleSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOMarker.html
%%DOCSDIR%%-%%SHORT_VER%%/GOOptionMenu.html
+%%DOCSDIR%%-%%SHORT_VER%%/GOPalette.html
%%DOCSDIR%%-%%SHORT_VER%%/GOPersist.html
%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoader.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoaderModule.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOPluginService.html
-%%DOCSDIR%%-%%SHORT_VER%%/GORotationSel.html
%%DOCSDIR%%-%%SHORT_VER%%/GOSearchReplace.html
%%DOCSDIR%%-%%SHORT_VER%%/GOSelector.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOStyle.html
%%DOCSDIR%%-%%SHORT_VER%%/GOStyledObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocArc.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocCanvas.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocCircle.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocEllipse.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocGraph.html
+%%DOCSDIR%%-%%SHORT_VER%%/GOUndo.html
%%DOCSDIR%%-%%SHORT_VER%%/GocGroup.html
%%DOCSDIR%%-%%SHORT_VER%%/GocItem.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocPixbuf.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocPolygon.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocPolyline.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocRectangle.html
%%DOCSDIR%%-%%SHORT_VER%%/GocStyledItem.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocText.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocWidget.html
-%%DOCSDIR%%-%%SHORT_VER%%/Gog3DBox.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogAxis.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogAxisLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogChart.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogDataAllocator.html
+%%DOCSDIR%%-%%SHORT_VER%%/GogDataEditor.html
%%DOCSDIR%%-%%SHORT_VER%%/GogDataset.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogErrorBar.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogGraph.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogGrid.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogGridLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogLabel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogLegend.html
%%DOCSDIR%%-%%SHORT_VER%%/GogObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogOutlinedObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogPlot.html
+%%DOCSDIR%%-%%SHORT_VER%%/GogOutlinedView.html
%%DOCSDIR%%-%%SHORT_VER%%/GogRegCurve.html
%%DOCSDIR%%-%%SHORT_VER%%/GogRegEqn.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogRenderer.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogSeries.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogSeriesLines.html
%%DOCSDIR%%-%%SHORT_VER%%/GogSmoothedCurve.html
%%DOCSDIR%%-%%SHORT_VER%%/GogStyledObject.html
%%DOCSDIR%%-%%SHORT_VER%%/GogText.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogTheme.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogTrendLine.html
%%DOCSDIR%%-%%SHORT_VER%%/GogView.html
%%DOCSDIR%%-%%SHORT_VER%%/ch01.html
%%DOCSDIR%%-%%SHORT_VER%%/ch02.html
@@ -323,50 +271,94 @@
%%DOCSDIR%%-%%SHORT_VER%%/ch15.html
%%DOCSDIR%%-%%SHORT_VER%%/ch16.html
%%DOCSDIR%%-%%SHORT_VER%%/ch17.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-GOffice.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-bezier.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-cairo.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-calendar-button.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-charmap-sel.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-cmd-context.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-color-group.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-color.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-combo-color.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-combo-pixmaps.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-combo-text.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-complex.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-component-factory.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-cspline.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-data-simple.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-data.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-distribution.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-doc-control.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-doc.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-editor.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-fft.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-file.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-font-sel.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-font.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-format-sel.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-format.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-geometry.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-glib-extras.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-gradient.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-graph-widget.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-image.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-libxml-extras.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-line.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-locale-sel.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-marker.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-math.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-path.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-pattern.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-plugin-loader-module.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-plugin-service.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-plugin.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-regression.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-rotation-sel.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-string.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-style.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-go-units.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-arc.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-canvas.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-circle.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-ellipse.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-graph.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-line.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-pixbuf.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-polygon.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-polyline.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-rectangle.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-structs.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-text.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-utils.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-goc-widget.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-3d-box.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-axis-line.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-axis.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-chart-map.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-chart.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-error-bar.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-graph.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-grid-line.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-grid.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-guru.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-legend.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-plot-engine.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-plot.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-renderer.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-series-lines.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-series.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-theme.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-gog-trend-line.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10-io-context.html
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10.devhelp
+%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.10.devhelp2
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOArrow.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOBezierSpline.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOCSpline.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOCairo.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOColor.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOComplex.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOComponentFactory.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOEditor.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFft.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFile.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFont.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFormat.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOGeometry.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOGlibExtras.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOGradient.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOLibxmlExtras.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOMath.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOPalette.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOPath.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOPattern.html
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GORange.html
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOReg.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GORegression.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOUndo.html
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOUrl.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOffice.html
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogAxisMap.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogChartMap.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogGuru.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogPlotEngine.html
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogTool.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Other-utilities.html
%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Other.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Simple-structures.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Units.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-color-group.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-data-simple.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-distribution.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-image.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-plugin.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-string.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8.devhelp
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8.devhelp2
%%DOCSDIR%%-%%SHORT_VER%%/home.png
%%DOCSDIR%%-%%SHORT_VER%%/index.html
%%DOCSDIR%%-%%SHORT_VER%%/index.sgml
@@ -397,6 +389,7 @@
%%DATADIR%%/%%VERSION%%/ui/gog-plot-prefs.ui
%%DATADIR%%/%%VERSION%%/ui/gog-reg-curve-prefs.ui
%%DATADIR%%/%%VERSION%%/ui/gog-reg-eqn-prefs.ui
+%%DATADIR%%/%%VERSION%%/ui/gog-series-labels-prefs.ui
%%DATADIR%%/%%VERSION%%/ui/gog-series-prefs.ui
share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -411,6 +404,7 @@
share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
share/locale/eu/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -589,26 +583,12 @@
@dirrm lib/goffice/%%VERSION%%
@dirrmtry lib/goffice
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/utils
-@dirrm include/libgoffice-%%SHORT_VER%%/goffice/ms-compat
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/math
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/gtk
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/graph
-@dirrm include/libgoffice-%%SHORT_VER%%/goffice/drawing
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/data
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/component
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/canvas
@dirrm include/libgoffice-%%SHORT_VER%%/goffice/app
@dirrm include/libgoffice-%%SHORT_VER%%/goffice
@dirrm include/libgoffice-%%SHORT_VER%%
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
diff -ruN --exclude=CVS /usr/ports/math/gnumeric.orig/Makefile /usr/ports/math/gnumeric/Makefile
--- /usr/ports/math/gnumeric.orig/Makefile 2011-11-22 08:48:13.000000000 -0600
+++ /usr/ports/math/gnumeric/Makefile 2012-02-16 19:06:22.050327439 -0600
@@ -8,7 +8,7 @@
# When updating, remember to update pkg-plist of gchemutils.
PORTNAME= gnumeric
-PORTVERSION= 1.10.17
+PORTVERSION= 1.11.1
CATEGORIES= math gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +20,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS= goffice-0.8.8:${PORTSDIR}/devel/goffice \
+LIB_DEPENDS= goffice-0.10:${PORTSDIR}/devel/goffice \
psiconv.10:${PORTSDIR}/converters/psiconv
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
@@ -37,7 +37,7 @@
WANT_PERL= yes
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gnome --disable-silent-rules
+CONFIGURE_ARGS= --disable-silent-rules
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
python_prog=${PYTHON_VERSION}
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -49,21 +49,13 @@
MAN1= gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1
-PLIST_SUB= VERSION=${PORTVERSION} GOFFICE=0.8.17
+PLIST_SUB= VERSION=${PORTVERSION} GOFFICE=0.9.1
OPTIONS= PERL "Enable Perl as extension language" on
#GNOMEDB "Enable libgnomedb support" off
.include <bsd.port.pre.mk>
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-CONFIGURE_ARGS+=--with-gnome=yes
-USE_GNOME+= libgnomeui libgsf_gnome
-.else
-CONFIGURE_ARGS+=--with-gnome=no
-USE_GNOME+= libgsf
-.endif
-
.if defined(WITH_PERL)
USE_PERL5= yes
PLIST_SUB+= PERL=""
@@ -85,7 +77,7 @@
@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
@${REINPLACE_CMD} -e 's|gda-3.0 >= 3.1.1|gda-3.0 >= 3.0.1|g' \
-e 's|gnomedb-3.0 >= 3.0.1|gnomedb-3.0 >= 3.0.0|g' \
- -e 's|gnumeric_with_gconf=true|gnumeric_with_gconf=false|g' \
+ -e 's|-Werror=format-security ||g' \
${WRKSRC}/configure
post-install:
diff -ruN --exclude=CVS /usr/ports/math/gnumeric.orig/distinfo /usr/ports/math/gnumeric/distinfo
--- /usr/ports/math/gnumeric.orig/distinfo 2011-11-22 08:48:13.000000000 -0600
+++ /usr/ports/math/gnumeric/distinfo 2012-02-16 15:31:14.922457501 -0600
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnumeric-1.10.17.tar.xz) = 8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963
-SIZE (gnome2/gnumeric-1.10.17.tar.xz) = 14332716
+SHA256 (gnome2/gnumeric-1.11.1.tar.xz) = 6ebee914a652858534b9d5d7ce4ea4dcbbd97525227a042ee5bbc2e45756dd3e
+SIZE (gnome2/gnumeric-1.11.1.tar.xz) = 14451268
diff -ruN --exclude=CVS /usr/ports/math/gnumeric.orig/files/patch-libspreadsheet.pc.in /usr/ports/math/gnumeric/files/patch-libspreadsheet.pc.in
--- /usr/ports/math/gnumeric.orig/files/patch-libspreadsheet.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/math/gnumeric/files/patch-libspreadsheet.pc.in 2012-02-17 03:42:13.157409321 -0600
@@ -0,0 +1,8 @@
+--- libspreadsheet.pc.in~ 2011-08-02 18:39:49.000000000 -0500
++++ libspreadsheet.pc.in 2012-02-17 03:41:53.602031405 -0600
+@@ -19,4 +19,4 @@ Libs: -L${libdir} -lspreadsheet-${VERSIO
+ # for now include both the directory and the child, until we rename the includes in svn
+ Cflags: -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@ -I${gnumeric_libdir}/include
+
+-PluginDir=@gnumeric_externplugindir@
++PluginDir=@gnumeric_plugindir@
diff -ruN --exclude=CVS /usr/ports/math/gnumeric.orig/pkg-plist /usr/ports/math/gnumeric/pkg-plist
--- /usr/ports/math/gnumeric.orig/pkg-plist 2011-11-22 08:48:13.000000000 -0600
+++ /usr/ports/math/gnumeric/pkg-plist 2012-02-16 19:37:49.659884213 -0600
@@ -3,137 +3,138 @@
bin/ssconvert
bin/ssindex
bin/ssgrep
-include/libspreadsheet-1.10/spreadsheet/application.h
-include/libspreadsheet-1.10/spreadsheet/auto-format.h
-include/libspreadsheet-1.10/spreadsheet/cell-draw.h
-include/libspreadsheet-1.10/spreadsheet/cell.h
-include/libspreadsheet-1.10/spreadsheet/cellspan.h
-include/libspreadsheet-1.10/spreadsheet/clipboard.h
-include/libspreadsheet-1.10/spreadsheet/cmd-edit.h
-include/libspreadsheet-1.10/spreadsheet/collect.h
-include/libspreadsheet-1.10/spreadsheet/colrow.h
-include/libspreadsheet-1.10/spreadsheet/command-context-stderr.h
-include/libspreadsheet-1.10/spreadsheet/command-context.h
-include/libspreadsheet-1.10/spreadsheet/commands.h
-include/libspreadsheet-1.10/spreadsheet/complete-sheet.h
-include/libspreadsheet-1.10/spreadsheet/complete.h
-include/libspreadsheet-1.10/spreadsheet/complex.h
-include/libspreadsheet-1.10/spreadsheet/consolidate.h
-include/libspreadsheet-1.10/spreadsheet/dependent.h
-include/libspreadsheet-1.10/spreadsheet/expr-impl.h
-include/libspreadsheet-1.10/spreadsheet/expr-name.h
-include/libspreadsheet-1.10/spreadsheet/expr.h
-include/libspreadsheet-1.10/spreadsheet/file-autoft.h
-include/libspreadsheet-1.10/spreadsheet/format-template.h
-include/libspreadsheet-1.10/spreadsheet/func-builtin.h
-include/libspreadsheet-1.10/spreadsheet/func.h
-include/libspreadsheet-1.10/spreadsheet/gnm-command-impl.h
-include/libspreadsheet-1.10/spreadsheet/gnm-commands-slicer.h
-include/libspreadsheet-1.10/spreadsheet/gnm-data-cache-source.h
-include/libspreadsheet-1.10/spreadsheet/gnm-datetime.h
-include/libspreadsheet-1.10/spreadsheet/gnm-format.h
-include/libspreadsheet-1.10/spreadsheet/gnm-graph-window.h
-include/libspreadsheet-1.10/spreadsheet/gnm-pane.h
-include/libspreadsheet-1.10/spreadsheet/gnm-plugin.h
-include/libspreadsheet-1.10/spreadsheet/gnm-random.h
-include/libspreadsheet-1.10/spreadsheet/gnm-sheet-slicer.h
-include/libspreadsheet-1.10/spreadsheet/gnm-so-filled.h
-include/libspreadsheet-1.10/spreadsheet/gnm-so-line.h
-include/libspreadsheet-1.10/spreadsheet/gnm-so-polygon.h
-include/libspreadsheet-1.10/spreadsheet/gnm-style-impl.h
-include/libspreadsheet-1.10/spreadsheet/gnumeric-features.h
-include/libspreadsheet-1.10/spreadsheet/gnumeric-gconf.h
-include/libspreadsheet-1.10/spreadsheet/gnumeric-simple-canvas.h
-include/libspreadsheet-1.10/spreadsheet/gnumeric.h
-include/libspreadsheet-1.10/spreadsheet/go-data-cache-field.h
-include/libspreadsheet-1.10/spreadsheet/go-data-cache-source.h
-include/libspreadsheet-1.10/spreadsheet/go-data-cache.h
-include/libspreadsheet-1.10/spreadsheet/go-data-slicer-field.h
-include/libspreadsheet-1.10/spreadsheet/go-data-slicer.h
-include/libspreadsheet-1.10/spreadsheet/go-val.h
-include/libspreadsheet-1.10/spreadsheet/graph.h
-include/libspreadsheet-1.10/spreadsheet/gui-clipboard.h
-include/libspreadsheet-1.10/spreadsheet/gui-file.h
-include/libspreadsheet-1.10/spreadsheet/gui-gnumeric.h
-include/libspreadsheet-1.10/spreadsheet/gui-util.h
-include/libspreadsheet-1.10/spreadsheet/gutils.h
-include/libspreadsheet-1.10/spreadsheet/history.h
-include/libspreadsheet-1.10/spreadsheet/hlink-impl.h
-include/libspreadsheet-1.10/spreadsheet/hlink.h
-include/libspreadsheet-1.10/spreadsheet/input-msg.h
-include/libspreadsheet-1.10/spreadsheet/item-bar.h
-include/libspreadsheet-1.10/spreadsheet/item-cursor.h
-include/libspreadsheet-1.10/spreadsheet/item-edit.h
-include/libspreadsheet-1.10/spreadsheet/item-grid.h
-include/libspreadsheet-1.10/spreadsheet/libgnumeric.h
-include/libspreadsheet-1.10/spreadsheet/mathfunc.h
-include/libspreadsheet-1.10/spreadsheet/mstyle.h
-include/libspreadsheet-1.10/spreadsheet/number-match.h
-include/libspreadsheet-1.10/spreadsheet/numbers.h
-include/libspreadsheet-1.10/spreadsheet/parse-util.h
-include/libspreadsheet-1.10/spreadsheet/pattern.h
-include/libspreadsheet-1.10/spreadsheet/position.h
-include/libspreadsheet-1.10/spreadsheet/preview-grid.h
-include/libspreadsheet-1.10/spreadsheet/print-cell.h
-include/libspreadsheet-1.10/spreadsheet/print-info.h
-include/libspreadsheet-1.10/spreadsheet/print.h
-include/libspreadsheet-1.10/spreadsheet/rangefunc-strings.h
-include/libspreadsheet-1.10/spreadsheet/rangefunc.h
-include/libspreadsheet-1.10/spreadsheet/ranges.h
-include/libspreadsheet-1.10/spreadsheet/regression.h
-include/libspreadsheet-1.10/spreadsheet/rendered-value.h
-include/libspreadsheet-1.10/spreadsheet/search.h
-include/libspreadsheet-1.10/spreadsheet/selection.h
-include/libspreadsheet-1.10/spreadsheet/session.h
-include/libspreadsheet-1.10/spreadsheet/sheet-autofill.h
-include/libspreadsheet-1.10/spreadsheet/sheet-control-gui-priv.h
-include/libspreadsheet-1.10/spreadsheet/sheet-control-gui.h
-include/libspreadsheet-1.10/spreadsheet/sheet-control-priv.h
-include/libspreadsheet-1.10/spreadsheet/sheet-control.h
-include/libspreadsheet-1.10/spreadsheet/sheet-filter-combo.h
-include/libspreadsheet-1.10/spreadsheet/sheet-filter.h
-include/libspreadsheet-1.10/spreadsheet/sheet-merge.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object-cell-comment.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object-graph.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object-image.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object-impl.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object-widget.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object-widget-impl.h
-include/libspreadsheet-1.10/spreadsheet/sheet-object.h
-include/libspreadsheet-1.10/spreadsheet/sheet-private.h
-include/libspreadsheet-1.10/spreadsheet/sheet-style.h
-include/libspreadsheet-1.10/spreadsheet/sheet-utils.h
-include/libspreadsheet-1.10/spreadsheet/sheet-view.h
-include/libspreadsheet-1.10/spreadsheet/sheet.h
-include/libspreadsheet-1.10/spreadsheet/sort.h
-include/libspreadsheet-1.10/spreadsheet/stf-export.h
-include/libspreadsheet-1.10/spreadsheet/stf-parse.h
-include/libspreadsheet-1.10/spreadsheet/stf.h
-include/libspreadsheet-1.10/spreadsheet/style-border.h
-include/libspreadsheet-1.10/spreadsheet/style-color.h
-include/libspreadsheet-1.10/spreadsheet/style-conditions.h
-include/libspreadsheet-1.10/spreadsheet/style-font.h
-include/libspreadsheet-1.10/spreadsheet/style.h
-include/libspreadsheet-1.10/spreadsheet/symbol.h
-include/libspreadsheet-1.10/spreadsheet/tools/dao.h
-include/libspreadsheet-1.10/spreadsheet/tools/gnm-solver.h
-include/libspreadsheet-1.10/spreadsheet/tools/tools.h
-include/libspreadsheet-1.10/spreadsheet/undo.h
-include/libspreadsheet-1.10/spreadsheet/validation-combo.h
-include/libspreadsheet-1.10/spreadsheet/validation.h
-include/libspreadsheet-1.10/spreadsheet/value.h
-include/libspreadsheet-1.10/spreadsheet/wbc-gtk-impl.h
-include/libspreadsheet-1.10/spreadsheet/wbc-gtk.h
-include/libspreadsheet-1.10/spreadsheet/widgets/gnm-notebook.h
-include/libspreadsheet-1.10/spreadsheet/widgets/gnumeric-expr-entry.h
-include/libspreadsheet-1.10/spreadsheet/workbook-cmd-format.h
-include/libspreadsheet-1.10/spreadsheet/workbook-control-priv.h
-include/libspreadsheet-1.10/spreadsheet/workbook-control.h
-include/libspreadsheet-1.10/spreadsheet/workbook-priv.h
-include/libspreadsheet-1.10/spreadsheet/workbook-view.h
-include/libspreadsheet-1.10/spreadsheet/workbook.h
-include/libspreadsheet-1.10/spreadsheet/xml-io-version.h
-include/libspreadsheet-1.10/spreadsheet/xml-sax.h
+include/libspreadsheet-1.12/spreadsheet/application.h
+include/libspreadsheet-1.12/spreadsheet/auto-format.h
+include/libspreadsheet-1.12/spreadsheet/cell-draw.h
+include/libspreadsheet-1.12/spreadsheet/cell.h
+include/libspreadsheet-1.12/spreadsheet/cellspan.h
+include/libspreadsheet-1.12/spreadsheet/clipboard.h
+include/libspreadsheet-1.12/spreadsheet/cmd-edit.h
+include/libspreadsheet-1.12/spreadsheet/collect.h
+include/libspreadsheet-1.12/spreadsheet/colrow.h
+include/libspreadsheet-1.12/spreadsheet/command-context-stderr.h
+include/libspreadsheet-1.12/spreadsheet/command-context.h
+include/libspreadsheet-1.12/spreadsheet/commands.h
+include/libspreadsheet-1.12/spreadsheet/complete-sheet.h
+include/libspreadsheet-1.12/spreadsheet/complete.h
+include/libspreadsheet-1.12/spreadsheet/complex.h
+include/libspreadsheet-1.12/spreadsheet/consolidate.h
+include/libspreadsheet-1.12/spreadsheet/dependent.h
+include/libspreadsheet-1.12/spreadsheet/expr-impl.h
+include/libspreadsheet-1.12/spreadsheet/expr-name.h
+include/libspreadsheet-1.12/spreadsheet/expr.h
+include/libspreadsheet-1.12/spreadsheet/file-autoft.h
+include/libspreadsheet-1.12/spreadsheet/format-template.h
+include/libspreadsheet-1.12/spreadsheet/func-builtin.h
+include/libspreadsheet-1.12/spreadsheet/func.h
+include/libspreadsheet-1.12/spreadsheet/gnm-command-impl.h
+include/libspreadsheet-1.12/spreadsheet/gnm-commands-slicer.h
+include/libspreadsheet-1.12/spreadsheet/gnm-data-cache-source.h
+include/libspreadsheet-1.12/spreadsheet/gnm-datetime.h
+include/libspreadsheet-1.12/spreadsheet/gnm-format.h
+include/libspreadsheet-1.12/spreadsheet/gnm-graph-window.h
+include/libspreadsheet-1.12/spreadsheet/gnm-pane.h
+include/libspreadsheet-1.12/spreadsheet/gnm-plugin.h
+include/libspreadsheet-1.12/spreadsheet/gnm-random.h
+include/libspreadsheet-1.12/spreadsheet/gnm-sheet-slicer.h
+include/libspreadsheet-1.12/spreadsheet/gnm-so-filled.h
+include/libspreadsheet-1.12/spreadsheet/gnm-so-line.h
+include/libspreadsheet-1.12/spreadsheet/gnm-so-polygon.h
+include/libspreadsheet-1.12/spreadsheet/gnm-style-impl.h
+include/libspreadsheet-1.12/spreadsheet/gnumeric-features.h
+include/libspreadsheet-1.12/spreadsheet/gnumeric-conf.h
+include/libspreadsheet-1.12/spreadsheet/gnumeric-simple-canvas.h
+include/libspreadsheet-1.12/spreadsheet/gnumeric.h
+include/libspreadsheet-1.12/spreadsheet/go-data-cache-field.h
+include/libspreadsheet-1.12/spreadsheet/go-data-cache-source.h
+include/libspreadsheet-1.12/spreadsheet/go-data-cache.h
+include/libspreadsheet-1.12/spreadsheet/go-data-slicer-field.h
+include/libspreadsheet-1.12/spreadsheet/go-data-slicer.h
+include/libspreadsheet-1.12/spreadsheet/go-val.h
+include/libspreadsheet-1.12/spreadsheet/graph.h
+include/libspreadsheet-1.12/spreadsheet/gui-clipboard.h
+include/libspreadsheet-1.12/spreadsheet/gui-file.h
+include/libspreadsheet-1.12/spreadsheet/gui-gnumeric.h
+include/libspreadsheet-1.12/spreadsheet/gui-util.h
+include/libspreadsheet-1.12/spreadsheet/gutils.h
+include/libspreadsheet-1.12/spreadsheet/history.h
+include/libspreadsheet-1.12/spreadsheet/hlink-impl.h
+include/libspreadsheet-1.12/spreadsheet/hlink.h
+include/libspreadsheet-1.12/spreadsheet/input-msg.h
+include/libspreadsheet-1.12/spreadsheet/item-bar.h
+include/libspreadsheet-1.12/spreadsheet/item-cursor.h
+include/libspreadsheet-1.12/spreadsheet/item-edit.h
+include/libspreadsheet-1.12/spreadsheet/item-grid.h
+include/libspreadsheet-1.12/spreadsheet/libgnumeric.h
+include/libspreadsheet-1.12/spreadsheet/mathfunc.h
+include/libspreadsheet-1.12/spreadsheet/mstyle.h
+include/libspreadsheet-1.12/spreadsheet/number-match.h
+include/libspreadsheet-1.12/spreadsheet/numbers.h
+include/libspreadsheet-1.12/spreadsheet/parse-util.h
+include/libspreadsheet-1.12/spreadsheet/pattern.h
+include/libspreadsheet-1.12/spreadsheet/position.h
+include/libspreadsheet-1.12/spreadsheet/preview-grid.h
+include/libspreadsheet-1.12/spreadsheet/print-cell.h
+include/libspreadsheet-1.12/spreadsheet/print-info.h
+include/libspreadsheet-1.12/spreadsheet/print.h
+include/libspreadsheet-1.12/spreadsheet/rangefunc-strings.h
+include/libspreadsheet-1.12/spreadsheet/rangefunc.h
+include/libspreadsheet-1.12/spreadsheet/ranges.h
+include/libspreadsheet-1.12/spreadsheet/regression.h
+include/libspreadsheet-1.12/spreadsheet/rendered-value.h
+include/libspreadsheet-1.12/spreadsheet/search.h
+include/libspreadsheet-1.12/spreadsheet/selection.h
+include/libspreadsheet-1.12/spreadsheet/session.h
+include/libspreadsheet-1.12/spreadsheet/sheet-autofill.h
+include/libspreadsheet-1.12/spreadsheet/sheet-control-gui-priv.h
+include/libspreadsheet-1.12/spreadsheet/sheet-control-gui.h
+include/libspreadsheet-1.12/spreadsheet/sheet-control-priv.h
+include/libspreadsheet-1.12/spreadsheet/sheet-control.h
+include/libspreadsheet-1.12/spreadsheet/sheet-filter-combo.h
+include/libspreadsheet-1.12/spreadsheet/sheet-filter.h
+include/libspreadsheet-1.12/spreadsheet/sheet-merge.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-cell-comment.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-component.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-graph.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-image.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-impl.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-widget.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object-widget-impl.h
+include/libspreadsheet-1.12/spreadsheet/sheet-object.h
+include/libspreadsheet-1.12/spreadsheet/sheet-private.h
+include/libspreadsheet-1.12/spreadsheet/sheet-style.h
+include/libspreadsheet-1.12/spreadsheet/sheet-utils.h
+include/libspreadsheet-1.12/spreadsheet/sheet-view.h
+include/libspreadsheet-1.12/spreadsheet/sheet.h
+include/libspreadsheet-1.12/spreadsheet/sort.h
+include/libspreadsheet-1.12/spreadsheet/stf-export.h
+include/libspreadsheet-1.12/spreadsheet/stf-parse.h
+include/libspreadsheet-1.12/spreadsheet/stf.h
+include/libspreadsheet-1.12/spreadsheet/style-border.h
+include/libspreadsheet-1.12/spreadsheet/style-color.h
+include/libspreadsheet-1.12/spreadsheet/style-conditions.h
+include/libspreadsheet-1.12/spreadsheet/style-font.h
+include/libspreadsheet-1.12/spreadsheet/style.h
+include/libspreadsheet-1.12/spreadsheet/symbol.h
+include/libspreadsheet-1.12/spreadsheet/tools/dao.h
+include/libspreadsheet-1.12/spreadsheet/tools/gnm-solver.h
+include/libspreadsheet-1.12/spreadsheet/tools/tools.h
+include/libspreadsheet-1.12/spreadsheet/undo.h
+include/libspreadsheet-1.12/spreadsheet/validation-combo.h
+include/libspreadsheet-1.12/spreadsheet/validation.h
+include/libspreadsheet-1.12/spreadsheet/value.h
+include/libspreadsheet-1.12/spreadsheet/wbc-gtk-impl.h
+include/libspreadsheet-1.12/spreadsheet/wbc-gtk.h
+include/libspreadsheet-1.12/spreadsheet/widgets/gnm-notebook.h
+include/libspreadsheet-1.12/spreadsheet/widgets/gnumeric-expr-entry.h
+include/libspreadsheet-1.12/spreadsheet/workbook-cmd-format.h
+include/libspreadsheet-1.12/spreadsheet/workbook-control-priv.h
+include/libspreadsheet-1.12/spreadsheet/workbook-control.h
+include/libspreadsheet-1.12/spreadsheet/workbook-priv.h
+include/libspreadsheet-1.12/spreadsheet/workbook-view.h
+include/libspreadsheet-1.12/spreadsheet/workbook.h
+include/libspreadsheet-1.12/spreadsheet/xml-io-version.h
+include/libspreadsheet-1.12/spreadsheet/xml-sax.h
lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
@@ -283,7 +284,7 @@
lib/libspreadsheet-%%VERSION%%.so
lib/libspreadsheet.la
lib/libspreadsheet.so
-libdata/pkgconfig/libspreadsheet-1.10.pc
+libdata/pkgconfig/libspreadsheet-1.12.pc
@exec update-desktop-database > /dev/null || /usr/bin/true
share/applications/gnumeric.desktop
share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
@@ -322,86 +323,6 @@
share/gnumeric/%%VERSION%%/templates/loan.gnumeric
share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
share/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
-share/gnumeric/%%VERSION%%/ui/advanced-filter.ui
-share/gnumeric/%%VERSION%%/ui/anova-one.ui
-share/gnumeric/%%VERSION%%/ui/anova-two.ui
-share/gnumeric/%%VERSION%%/ui/autofilter-expression.ui
-share/gnumeric/%%VERSION%%/ui/autofilter-top10.ui
-share/gnumeric/%%VERSION%%/ui/autoformat.ui
-share/gnumeric/%%VERSION%%/ui/autosave.ui
-share/gnumeric/%%VERSION%%/ui/cell-comment.ui
-share/gnumeric/%%VERSION%%/ui/cell-format.ui
-share/gnumeric/%%VERSION%%/ui/cell-format-cond.ui
-share/gnumeric/%%VERSION%%/ui/cell-sort.ui
-share/gnumeric/%%VERSION%%/ui/chi-squared.ui
-share/gnumeric/%%VERSION%%/ui/col-width.ui
-share/gnumeric/%%VERSION%%/ui/colrow.ui
-share/gnumeric/%%VERSION%%/ui/consolidate.ui
-share/gnumeric/%%VERSION%%/ui/correlation.ui
-share/gnumeric/%%VERSION%%/ui/covariance.ui
-share/gnumeric/%%VERSION%%/ui/dao.ui
-share/gnumeric/%%VERSION%%/ui/data-slicer.ui
-share/gnumeric/%%VERSION%%/ui/data-table.ui
-share/gnumeric/%%VERSION%%/ui/define-name.ui
-share/gnumeric/%%VERSION%%/ui/delete-cells.ui
-share/gnumeric/%%VERSION%%/ui/descriptive-stats.ui
-share/gnumeric/%%VERSION%%/ui/dialog-stf-export.ui
-share/gnumeric/%%VERSION%%/ui/dialog-stf.ui
-share/gnumeric/%%VERSION%%/ui/dialog-zoom.ui
-share/gnumeric/%%VERSION%%/ui/doc-meta-data.ui
-share/gnumeric/%%VERSION%%/ui/exp-smoothing.ui
-share/gnumeric/%%VERSION%%/ui/fill-series.ui
-share/gnumeric/%%VERSION%%/ui/font-sel.ui
-share/gnumeric/%%VERSION%%/ui/formula-guru.ui
-share/gnumeric/%%VERSION%%/ui/fourier-analysis.ui
-share/gnumeric/%%VERSION%%/ui/frequency.ui
-share/gnumeric/%%VERSION%%/ui/function-select.ui
-share/gnumeric/%%VERSION%%/ui/goalseek.ui
-share/gnumeric/%%VERSION%%/ui/goto.ui
-share/gnumeric/%%VERSION%%/ui/hf-config.ui
-share/gnumeric/%%VERSION%%/ui/hf-dt-format.ui
-share/gnumeric/%%VERSION%%/ui/histogram.ui
-share/gnumeric/%%VERSION%%/ui/hyperlink.ui
-share/gnumeric/%%VERSION%%/ui/insert-cells.ui
-share/gnumeric/%%VERSION%%/ui/kaplan-meier.ui
-share/gnumeric/%%VERSION%%/ui/mean-tests.ui
-share/gnumeric/%%VERSION%%/ui/merge.ui
-share/gnumeric/%%VERSION%%/ui/moving-averages.ui
-share/gnumeric/%%VERSION%%/ui/normality-tests.ui
-share/gnumeric/%%VERSION%%/ui/paste-special.ui
-share/gnumeric/%%VERSION%%/ui/plugin-manager.ui
-share/gnumeric/%%VERSION%%/ui/preferences.ui
-share/gnumeric/%%VERSION%%/ui/principal-components.ui
-share/gnumeric/%%VERSION%%/ui/print.ui
-share/gnumeric/%%VERSION%%/ui/random-generation-cor.ui
-share/gnumeric/%%VERSION%%/ui/random-generation.ui
-share/gnumeric/%%VERSION%%/ui/rank.ui
-share/gnumeric/%%VERSION%%/ui/regression.ui
-share/gnumeric/%%VERSION%%/ui/row-height.ui
-share/gnumeric/%%VERSION%%/ui/sampling.ui
-share/gnumeric/%%VERSION%%/ui/scenario-add.ui
-share/gnumeric/%%VERSION%%/ui/scenario-manager.ui
-share/gnumeric/%%VERSION%%/ui/search.ui
-share/gnumeric/%%VERSION%%/ui/search-replace.ui
-share/gnumeric/%%VERSION%%/ui/sheet-order.ui
-share/gnumeric/%%VERSION%%/ui/sheet-resize.ui
-share/gnumeric/%%VERSION%%/ui/sheetobject-size.ui
-share/gnumeric/%%VERSION%%/ui/shuffle.ui
-share/gnumeric/%%VERSION%%/ui/sign-test-two.ui
-share/gnumeric/%%VERSION%%/ui/sign-test.ui
-share/gnumeric/%%VERSION%%/ui/simulation.ui
-share/gnumeric/%%VERSION%%/ui/so-button.ui
-share/gnumeric/%%VERSION%%/ui/so-checkbox.ui
-share/gnumeric/%%VERSION%%/ui/so-frame.ui
-share/gnumeric/%%VERSION%%/ui/so-list.ui
-share/gnumeric/%%VERSION%%/ui/so-radiobutton.ui
-share/gnumeric/%%VERSION%%/ui/so-scrollbar.ui
-share/gnumeric/%%VERSION%%/ui/solver.ui
-share/gnumeric/%%VERSION%%/ui/tabulate.ui
-share/gnumeric/%%VERSION%%/ui/variance-tests.ui
-share/gnumeric/%%VERSION%%/ui/view.ui
-share/gnumeric/%%VERSION%%/ui/wilcoxon-mann-whitney.ui
-share/gnumeric/%%VERSION%%/ui/workbook-attr.ui
share/gnome/help/gnumeric/C/about-authors.xml
share/gnome/help/gnumeric/C/about-history.xml
share/gnome/help/gnumeric/C/about-license.xml
@@ -427,6 +348,7 @@
share/gnome/help/gnumeric/C/data-entry-external.xml
share/gnome/help/gnumeric/C/data-entry.xml
share/gnome/help/gnumeric/C/data-filter.xml
+share/gnome/help/gnumeric/C/data-format-conditional.xml
share/gnome/help/gnumeric/C/data-format.xml
share/gnome/help/gnumeric/C/data-generate.xml
share/gnome/help/gnumeric/C/data-insert.xml
@@ -738,7 +660,9 @@
share/gnome/help/gnumeric/C/figures/menu-format-labelled.png
share/gnome/help/gnumeric/C/figures/menu-format-sheet.png
share/gnome/help/gnumeric/C/figures/menu-help-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-insert-fw.png
share/gnome/help/gnumeric/C/figures/menu-insert-labelled.png
+share/gnome/help/gnumeric/C/figures/menu-insert-names.png
share/gnome/help/gnumeric/C/figures/menu-tools-labelled.png
share/gnome/help/gnumeric/C/figures/menu-torn-off.png
share/gnome/help/gnumeric/C/figures/menu-view-labelled.png
@@ -913,6 +837,8 @@
share/locale/en_CA/LC_MESSAGES/gnumeric.mo
share/locale/en_GB/LC_MESSAGES/gnumeric-functions.mo
share/locale/en_GB/LC_MESSAGES/gnumeric.mo
+share/locale/eo/LC_MESSAGES/gnumeric-functions.mo
+share/locale/eo/LC_MESSAGES/gnumeric.mo
share/locale/es/LC_MESSAGES/gnumeric-functions.mo
share/locale/es/LC_MESSAGES/gnumeric.mo
share/locale/et/LC_MESSAGES/gnumeric-functions.mo
@@ -1006,7 +932,6 @@
@dirrm share/gnome/help/gnumeric/C/figures
@dirrm share/gnome/help/gnumeric/C
@dirrm share/gnome/help/gnumeric
-@dirrm share/gnumeric/%%VERSION%%/ui
@dirrm share/gnumeric/%%VERSION%%/templates
@dirrm share/gnumeric/%%VERSION%%/doc/C
@dirrm share/gnumeric/%%VERSION%%/doc
@@ -1069,25 +994,9 @@
@dirrm lib/gnumeric/%%VERSION%%/plugins
@dirrm lib/gnumeric/%%VERSION%%
@dirrm lib/gnumeric
-@dirrm include/libspreadsheet-1.10/spreadsheet/widgets
-@dirrm include/libspreadsheet-1.10/spreadsheet/tools
-@dirrm include/libspreadsheet-1.10/spreadsheet
-@dirrm include/libspreadsheet-1.10
+@dirrm include/libspreadsheet-1.12/spreadsheet/widgets
+@dirrm include/libspreadsheet-1.12/spreadsheet/tools
+@dirrm include/libspreadsheet-1.12/spreadsheet
+@dirrm include/libspreadsheet-1.12
@unexec update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/applications
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
diff -ruN --exclude=CVS /usr/ports/science/openbabel.orig/Makefile /usr/ports/science/openbabel/Makefile
--- /usr/ports/science/openbabel.orig/Makefile 2011-11-09 09:25:42.000000000 -0600
+++ /usr/ports/science/openbabel/Makefile 2012-02-17 00:11:09.159170447 -0600
@@ -7,7 +7,7 @@
#
PORTNAME= openbabel
-PORTVERSION= 2.2.3
+PORTVERSION= 2.3.1
CATEGORIES= science
MASTER_SITES= SF
@@ -16,30 +16,30 @@
LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs
+USE_CMAKE= yes
USE_GNOME= gnomehack libxml2
-USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
MAN1= obchiral.1 obconformer.1 obenergy.1 obfit.1 obgen.1 obgrep.1 \
obminimize.1 obprobe.1 obprop.1 obrotamer.1 obrotate.1 \
- openbabel.1 roundtrip.1
+ openbabel.1 roundtrip.1 OBGUI.1 obabel.1
-PLIST_SUB= VERSION="${PORTVERSION}"
-
-MAKE_JOBS_SAFE= yes
+OPTIONS= EIGEN2 "Include Eigen 2 support" off
.include <bsd.port.pre.mk>
-post-extract:
- @${LN} -sf babel.1 ${WRKSRC}/doc/openbabel.1
+PLIST_SUB= VERSION="${PORTVERSION}"
+MAKE_JOBS_SAFE= yes
+CMAKE_ARGS+= -DBUILD_GUI=OFF
+
+.if !defined(WITHOUT_EIGEN2)
+BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2
+CMAKE_ARGS+= -DWITH_EIGEN2=ON
+.else
+CMAKE_ARGS+= -DWITH_EIGEN2=OFF
+.endif
post-patch:
- @${REINPLACE_CMD} -e \
- 's|/usr/local/|${LOCALBASE}|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e \
- 's|= babel|= openbabel|g' ${WRKSRC}/doc/Makefile.in
- @${REINPLACE_CMD} -e 's| babel| openbabel|g ; \
- s|"babel|"openbabel|g' ${WRKSRC}/doc/o*.1
- @${REINPLACE_CMD} -e 's|babel$$(EXEEXT)|openbabel$$(EXEEXT)|g' ${WRKSRC}/tools/Makefile.in
+ @(cd ${WRKSRC}/doc && ${MV} babel.1 openbabel.1)
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/science/openbabel.orig/distinfo /usr/ports/science/openbabel/distinfo
--- /usr/ports/science/openbabel.orig/distinfo 2011-07-03 08:22:19.000000000 -0500
+++ /usr/ports/science/openbabel/distinfo 2012-02-16 21:33:54.393935105 -0600
@@ -1,2 +1,2 @@
-SHA256 (openbabel-2.2.3.tar.gz) = eabc8bdbd68431f441b6b40adde0861b2e99750efd21bbb4870ee0a233feae46
-SIZE (openbabel-2.2.3.tar.gz) = 6624028
+SHA256 (openbabel-2.3.1.tar.gz) = 9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3
+SIZE (openbabel-2.3.1.tar.gz) = 20142960
diff -ruN --exclude=CVS /usr/ports/science/openbabel.orig/files/patch-CMakeLists.txt /usr/ports/science/openbabel/files/patch-CMakeLists.txt
--- /usr/ports/science/openbabel.orig/files/patch-CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/science/openbabel/files/patch-CMakeLists.txt 2012-02-16 23:54:43.352101482 -0600
@@ -0,0 +1,29 @@
+--- CMakeLists.txt.orig 2011-09-15 14:45:59.000000000 -0500
++++ CMakeLists.txt 2012-02-16 23:54:19.803617500 -0600
+@@ -385,7 +385,7 @@ if(NOT MSVC)
+ configure_file(${openbabel_SOURCE_DIR}/openbabel-2.0.pc.cmake
+ ${openbabel_BINARY_DIR}/openbabel-2.0.pc @ONLY)
+ install(FILES ${openbabel_BINARY_DIR}/openbabel-2.0.pc
+- DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
+ endif()
+
+ include_directories(${openbabel_BINARY_DIR}/include
+@@ -393,13 +393,15 @@ include_directories(${openbabel_BINARY_D
+ ${openbabel_SOURCE_DIR}/include
+ )
+
+-#cjh
++option(WITH_EIGEN2 "Enable Eigen2" OFF)
++
++if(WITH_EIGEN2)
+ find_package(Eigen2) # find and setup Eigen2
+ if(EIGEN2_FOUND)
+ add_definitions (-DHAVE_EIGEN)
+ include_directories(${EIGEN2_INCLUDE_DIR})
+ endif()
+-#cjh
++endif()
+
+ find_package(Cairo)
+ if(CAIRO_FOUND)
diff -ruN --exclude=CVS /usr/ports/science/openbabel.orig/files/patch-doc_CMakeLists.txt /usr/ports/science/openbabel/files/patch-doc_CMakeLists.txt
--- /usr/ports/science/openbabel.orig/files/patch-doc_CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/science/openbabel/files/patch-doc_CMakeLists.txt 2012-02-16 21:56:14.697485061 -0600
@@ -0,0 +1,9 @@
+--- doc/CMakeLists.txt~ 2010-07-12 08:05:06.000000000 -0500
++++ doc/CMakeLists.txt 2012-02-16 21:55:32.831652299 -0600
+@@ -1,5 +1,5 @@
+ file(GLOB man_1 *.1)
+-install(FILES ${man_1} DESTINATION share/man/man1)
++install(FILES ${man_1} DESTINATION man/man1)
+
+ OPTION(BUILD_DOCS "Build Open Babel documentation" OFF)
+ IF(BUILD_DOCS)
diff -ruN --exclude=CVS /usr/ports/science/openbabel.orig/files/patch-tools_CMakeLists.txt /usr/ports/science/openbabel/files/patch-tools_CMakeLists.txt
--- /usr/ports/science/openbabel.orig/files/patch-tools_CMakeLists.txt 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/science/openbabel/files/patch-tools_CMakeLists.txt 2012-02-17 00:03:58.710502071 -0600
@@ -0,0 +1,21 @@
+--- tools/CMakeLists.txt.orig 2010-11-17 15:32:21.000000000 -0600
++++ tools/CMakeLists.txt 2012-02-17 00:03:45.772237234 -0600
+@@ -27,11 +27,18 @@ if(BUILD_SHARED)
+ foreach(tool ${tools})
+ add_executable(${tool} ${tool}.cpp)
+ target_link_libraries(${tool} ${BABEL_LIBRARY})
++ if("${tool}" STREQUAL "babel")
++ install(PROGRAMS ../bin/${tool}
++ RENAME openbabel
++ DESTINATION bin
++ )
++ else()
+ install(TARGETS ${tool}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
++ endif()
+ endforeach(tool)
+
+ if(NOT MINIMAL_BUILD)
diff -ruN --exclude=CVS /usr/ports/science/openbabel.orig/pkg-plist /usr/ports/science/openbabel/pkg-plist
--- /usr/ports/science/openbabel.orig/pkg-plist 2009-08-10 12:13:43.000000000 -0500
+++ /usr/ports/science/openbabel/pkg-plist 2012-02-16 22:11:27.153725409 -0600
@@ -1,3 +1,4 @@
+bin/obabel
bin/obchiral
bin/obconformer
bin/obenergy
@@ -9,9 +10,10 @@
bin/obprop
bin/obrotamer
bin/obrotate
+bin/obspectrophore
bin/openbabel
bin/roundtrip
-include/inchi102/inchi_api.h
+include/inchi/inchi_api.h
include/openbabel-2.0/openbabel/alias.h
include/openbabel-2.0/openbabel/atom.h
include/openbabel-2.0/openbabel/atomclass.h
@@ -23,8 +25,10 @@
include/openbabel-2.0/openbabel/builder.h
include/openbabel-2.0/openbabel/canon.h
include/openbabel-2.0/openbabel/chains.h
+include/openbabel-2.0/openbabel/chargemodel.h
include/openbabel-2.0/openbabel/chemdrawcdx.h
include/openbabel-2.0/openbabel/chiral.h
+include/openbabel-2.0/openbabel/conformersearch.h
include/openbabel-2.0/openbabel/data.h
include/openbabel-2.0/openbabel/descriptor.h
include/openbabel-2.0/openbabel/dlhandler.h
@@ -32,18 +36,24 @@
include/openbabel-2.0/openbabel/forcefield.h
include/openbabel-2.0/openbabel/format.h
include/openbabel-2.0/openbabel/generic.h
+include/openbabel-2.0/openbabel/graphsym.h
include/openbabel-2.0/openbabel/grid.h
include/openbabel-2.0/openbabel/griddata.h
include/openbabel-2.0/openbabel/groupcontrib.h
+include/openbabel-2.0/openbabel/inchiformat.h
include/openbabel-2.0/openbabel/internalcoord.h
+include/openbabel-2.0/openbabel/isomorphism.h
include/openbabel-2.0/openbabel/kinetics.h
include/openbabel-2.0/openbabel/lineend.h
include/openbabel-2.0/openbabel/locale.h
+include/openbabel-2.0/openbabel/math/align.h
+include/openbabel-2.0/openbabel/math/erf.h
include/openbabel-2.0/openbabel/math/matrix3x3.h
include/openbabel-2.0/openbabel/math/spacegroup.h
include/openbabel-2.0/openbabel/math/transform3d.h
include/openbabel-2.0/openbabel/math/vector3.h
include/openbabel-2.0/openbabel/matrix.h
+include/openbabel-2.0/openbabel/mcdlutil.h
include/openbabel-2.0/openbabel/mol.h
include/openbabel-2.0/openbabel/molchrg.h
include/openbabel-2.0/openbabel/obconversion.h
@@ -58,273 +68,137 @@
include/openbabel-2.0/openbabel/phmodel.h
include/openbabel-2.0/openbabel/plugin.h
include/openbabel-2.0/openbabel/pointgroup.h
+include/openbabel-2.0/openbabel/query.h
include/openbabel-2.0/openbabel/rand.h
include/openbabel-2.0/openbabel/reaction.h
include/openbabel-2.0/openbabel/residue.h
include/openbabel-2.0/openbabel/ring.h
include/openbabel-2.0/openbabel/rotamer.h
include/openbabel-2.0/openbabel/rotor.h
+include/openbabel-2.0/openbabel/shared_ptr.h
+include/openbabel-2.0/openbabel/spectrophore.h
+include/openbabel-2.0/openbabel/stereo/cistrans.h
+include/openbabel-2.0/openbabel/stereo/squareplanar.h
+include/openbabel-2.0/openbabel/stereo/stereo.h
+include/openbabel-2.0/openbabel/stereo/tetrahedral.h
+include/openbabel-2.0/openbabel/stereo/tetranonplanar.h
+include/openbabel-2.0/openbabel/stereo/tetraplanar.h
+include/openbabel-2.0/openbabel/text.h
include/openbabel-2.0/openbabel/tokenst.h
include/openbabel-2.0/openbabel/typer.h
include/openbabel-2.0/openbabel/xml.h
-lib/libopenbabel.a
-lib/libopenbabel.la
+lib/cmake/openbabel2/OpenBabel2Config.cmake
+lib/cmake/openbabel2/OpenBabel2ConfigVersion.cmake
+lib/cmake/openbabel2/OpenBabel2_EXPORTS-release.cmake
+lib/cmake/openbabel2/OpenBabel2_EXPORTS.cmake
+lib/libinchi.so
+lib/libinchi.so.0
+lib/libinchi.so.0.3.1
lib/libopenbabel.so
-lib/libopenbabel.so.3
-lib/openbabel/%%VERSION%%/APIInterface.a
-lib/openbabel/%%VERSION%%/APIInterface.la
+lib/libopenbabel.so.4
+lib/libopenbabel.so.4.0.1
lib/openbabel/%%VERSION%%/APIInterface.so
-lib/openbabel/%%VERSION%%/CSRformat.a
-lib/openbabel/%%VERSION%%/CSRformat.la
lib/openbabel/%%VERSION%%/CSRformat.so
-lib/openbabel/%%VERSION%%/MCDLformat.a
-lib/openbabel/%%VERSION%%/MCDLformat.la
lib/openbabel/%%VERSION%%/MCDLformat.so
-lib/openbabel/%%VERSION%%/PQSformat.a
-lib/openbabel/%%VERSION%%/PQSformat.la
+lib/openbabel/%%VERSION%%/MNAformat.so
lib/openbabel/%%VERSION%%/PQSformat.so
-lib/openbabel/%%VERSION%%/acrformat.a
-lib/openbabel/%%VERSION%%/acrformat.la
+lib/openbabel/%%VERSION%%/abinitformat.so
lib/openbabel/%%VERSION%%/acrformat.so
-lib/openbabel/%%VERSION%%/adfformat.a
-lib/openbabel/%%VERSION%%/adfformat.la
lib/openbabel/%%VERSION%%/adfformat.so
-lib/openbabel/%%VERSION%%/alchemyformat.a
-lib/openbabel/%%VERSION%%/alchemyformat.la
lib/openbabel/%%VERSION%%/alchemyformat.so
-lib/openbabel/%%VERSION%%/amberformat.a
-lib/openbabel/%%VERSION%%/amberformat.la
lib/openbabel/%%VERSION%%/amberformat.so
-lib/openbabel/%%VERSION%%/balstformat.a
-lib/openbabel/%%VERSION%%/balstformat.la
lib/openbabel/%%VERSION%%/balstformat.so
-lib/openbabel/%%VERSION%%/bgfformat.a
-lib/openbabel/%%VERSION%%/bgfformat.la
lib/openbabel/%%VERSION%%/bgfformat.so
-lib/openbabel/%%VERSION%%/boxformat.a
-lib/openbabel/%%VERSION%%/boxformat.la
lib/openbabel/%%VERSION%%/boxformat.so
-lib/openbabel/%%VERSION%%/cacaoformat.a
-lib/openbabel/%%VERSION%%/cacaoformat.la
lib/openbabel/%%VERSION%%/cacaoformat.so
-lib/openbabel/%%VERSION%%/cacheformat.a
-lib/openbabel/%%VERSION%%/cacheformat.la
lib/openbabel/%%VERSION%%/cacheformat.so
-lib/openbabel/%%VERSION%%/carformat.a
-lib/openbabel/%%VERSION%%/carformat.la
lib/openbabel/%%VERSION%%/carformat.so
-lib/openbabel/%%VERSION%%/cccformat.a
-lib/openbabel/%%VERSION%%/cccformat.la
+lib/openbabel/%%VERSION%%/castepformat.so
lib/openbabel/%%VERSION%%/cccformat.so
-lib/openbabel/%%VERSION%%/cdxmlformat.a
-lib/openbabel/%%VERSION%%/cdxmlformat.la
lib/openbabel/%%VERSION%%/cdxmlformat.so
-lib/openbabel/%%VERSION%%/chem3dformat.a
-lib/openbabel/%%VERSION%%/chem3dformat.la
lib/openbabel/%%VERSION%%/chem3dformat.so
-lib/openbabel/%%VERSION%%/chemdrawcdxformat.a
-lib/openbabel/%%VERSION%%/chemdrawcdxformat.la
-lib/openbabel/%%VERSION%%/chemdrawcdxformat.so
-lib/openbabel/%%VERSION%%/chemdrawctformat.a
-lib/openbabel/%%VERSION%%/chemdrawctformat.la
-lib/openbabel/%%VERSION%%/chemdrawctformat.so
-lib/openbabel/%%VERSION%%/chemkinformat.a
-lib/openbabel/%%VERSION%%/chemkinformat.la
+lib/openbabel/%%VERSION%%/chemdrawcdx.so
+lib/openbabel/%%VERSION%%/chemdrawct.so
lib/openbabel/%%VERSION%%/chemkinformat.so
-lib/openbabel/%%VERSION%%/chemtoolformat.a
-lib/openbabel/%%VERSION%%/chemtoolformat.la
lib/openbabel/%%VERSION%%/chemtoolformat.so
-lib/openbabel/%%VERSION%%/cifformat.a
-lib/openbabel/%%VERSION%%/cifformat.la
lib/openbabel/%%VERSION%%/cifformat.so
-lib/openbabel/%%VERSION%%/cmlformat.a
-lib/openbabel/%%VERSION%%/cmlformat.la
lib/openbabel/%%VERSION%%/cmlformat.so
-lib/openbabel/%%VERSION%%/cmlreactformat.a
-lib/openbabel/%%VERSION%%/cmlreactformat.la
lib/openbabel/%%VERSION%%/cmlreactformat.so
-lib/openbabel/%%VERSION%%/copyformat.a
-lib/openbabel/%%VERSION%%/copyformat.la
lib/openbabel/%%VERSION%%/copyformat.so
-lib/openbabel/%%VERSION%%/crkformat.a
-lib/openbabel/%%VERSION%%/crkformat.la
lib/openbabel/%%VERSION%%/crkformat.so
-lib/openbabel/%%VERSION%%/cssrformat.a
-lib/openbabel/%%VERSION%%/cssrformat.la
lib/openbabel/%%VERSION%%/cssrformat.so
-lib/openbabel/%%VERSION%%/dmolformat.a
-lib/openbabel/%%VERSION%%/dmolformat.la
+lib/openbabel/%%VERSION%%/dlpolyformat.so
lib/openbabel/%%VERSION%%/dmolformat.so
-lib/openbabel/%%VERSION%%/fastaformat.a
-lib/openbabel/%%VERSION%%/fastaformat.la
lib/openbabel/%%VERSION%%/fastaformat.so
-lib/openbabel/%%VERSION%%/fastsearchformat.a
-lib/openbabel/%%VERSION%%/fastsearchformat.la
lib/openbabel/%%VERSION%%/fastsearchformat.so
-lib/openbabel/%%VERSION%%/fchkformat.a
-lib/openbabel/%%VERSION%%/fchkformat.la
lib/openbabel/%%VERSION%%/fchkformat.so
-lib/openbabel/%%VERSION%%/featformat.a
-lib/openbabel/%%VERSION%%/featformat.la
lib/openbabel/%%VERSION%%/featformat.so
-lib/openbabel/%%VERSION%%/fhformat.a
-lib/openbabel/%%VERSION%%/fhformat.la
lib/openbabel/%%VERSION%%/fhformat.so
-lib/openbabel/%%VERSION%%/fingerprintformat.a
-lib/openbabel/%%VERSION%%/fingerprintformat.la
+lib/openbabel/%%VERSION%%/fhiaimsformat.so
lib/openbabel/%%VERSION%%/fingerprintformat.so
-lib/openbabel/%%VERSION%%/freefracformat.a
-lib/openbabel/%%VERSION%%/freefracformat.la
lib/openbabel/%%VERSION%%/freefracformat.so
-lib/openbabel/%%VERSION%%/gamessformat.a
-lib/openbabel/%%VERSION%%/gamessformat.la
lib/openbabel/%%VERSION%%/gamessformat.so
-lib/openbabel/%%VERSION%%/gamessukformat.a
-lib/openbabel/%%VERSION%%/gamessukformat.la
lib/openbabel/%%VERSION%%/gamessukformat.so
-lib/openbabel/%%VERSION%%/gausscubeformat.a
-lib/openbabel/%%VERSION%%/gausscubeformat.la
lib/openbabel/%%VERSION%%/gausscubeformat.so
-lib/openbabel/%%VERSION%%/gaussformat.a
-lib/openbabel/%%VERSION%%/gaussformat.la
lib/openbabel/%%VERSION%%/gaussformat.so
-lib/openbabel/%%VERSION%%/gausszmatformat.a
-lib/openbabel/%%VERSION%%/gausszmatformat.la
lib/openbabel/%%VERSION%%/gausszmatformat.so
-lib/openbabel/%%VERSION%%/ghemicalformat.a
-lib/openbabel/%%VERSION%%/ghemicalformat.la
lib/openbabel/%%VERSION%%/ghemicalformat.so
-lib/openbabel/%%VERSION%%/gromos96format.a
-lib/openbabel/%%VERSION%%/gromos96format.la
+lib/openbabel/%%VERSION%%/groformat.so
lib/openbabel/%%VERSION%%/gromos96format.so
-lib/openbabel/%%VERSION%%/hinformat.a
-lib/openbabel/%%VERSION%%/hinformat.la
+lib/openbabel/%%VERSION%%/gulpformat.so
lib/openbabel/%%VERSION%%/hinformat.so
-lib/openbabel/%%VERSION%%/inchiformat.a
-lib/openbabel/%%VERSION%%/inchiformat.la
lib/openbabel/%%VERSION%%/inchiformat.so
-lib/openbabel/%%VERSION%%/jaguarformat.a
-lib/openbabel/%%VERSION%%/jaguarformat.la
lib/openbabel/%%VERSION%%/jaguarformat.so
-lib/openbabel/%%VERSION%%/mdlformat.a
-lib/openbabel/%%VERSION%%/mdlformat.la
lib/openbabel/%%VERSION%%/mdlformat.so
-lib/openbabel/%%VERSION%%/mmcifformat.a
-lib/openbabel/%%VERSION%%/mmcifformat.la
lib/openbabel/%%VERSION%%/mmcifformat.so
-lib/openbabel/%%VERSION%%/mmodformat.a
-lib/openbabel/%%VERSION%%/mmodformat.la
lib/openbabel/%%VERSION%%/mmodformat.so
-lib/openbabel/%%VERSION%%/mol2format.a
-lib/openbabel/%%VERSION%%/mol2format.la
lib/openbabel/%%VERSION%%/mol2format.so
-lib/openbabel/%%VERSION%%/moldenformat.a
-lib/openbabel/%%VERSION%%/moldenformat.la
lib/openbabel/%%VERSION%%/moldenformat.so
-lib/openbabel/%%VERSION%%/molproformat.a
-lib/openbabel/%%VERSION%%/molproformat.la
lib/openbabel/%%VERSION%%/molproformat.so
-lib/openbabel/%%VERSION%%/molreportformat.a
-lib/openbabel/%%VERSION%%/molreportformat.la
-lib/openbabel/%%VERSION%%/molreportformat.so
-lib/openbabel/%%VERSION%%/mopacformat.a
-lib/openbabel/%%VERSION%%/mopacformat.la
+lib/openbabel/%%VERSION%%/molreport.so
lib/openbabel/%%VERSION%%/mopacformat.so
-lib/openbabel/%%VERSION%%/mpdformat.a
-lib/openbabel/%%VERSION%%/mpdformat.la
lib/openbabel/%%VERSION%%/mpdformat.so
-lib/openbabel/%%VERSION%%/mpqcformat.a
-lib/openbabel/%%VERSION%%/mpqcformat.la
lib/openbabel/%%VERSION%%/mpqcformat.so
-lib/openbabel/%%VERSION%%/msiformat.a
-lib/openbabel/%%VERSION%%/msiformat.la
lib/openbabel/%%VERSION%%/msiformat.so
-lib/openbabel/%%VERSION%%/msmsformat.a
-lib/openbabel/%%VERSION%%/msmsformat.la
lib/openbabel/%%VERSION%%/msmsformat.so
-lib/openbabel/%%VERSION%%/nwchemformat.a
-lib/openbabel/%%VERSION%%/nwchemformat.la
+lib/openbabel/%%VERSION%%/nulformat.so
lib/openbabel/%%VERSION%%/nwchemformat.so
-lib/openbabel/%%VERSION%%/opendxformat.a
-lib/openbabel/%%VERSION%%/opendxformat.la
lib/openbabel/%%VERSION%%/opendxformat.so
-lib/openbabel/%%VERSION%%/outformat.a
-lib/openbabel/%%VERSION%%/outformat.la
lib/openbabel/%%VERSION%%/outformat.so
-lib/openbabel/%%VERSION%%/pcmodelformat.a
-lib/openbabel/%%VERSION%%/pcmodelformat.la
lib/openbabel/%%VERSION%%/pcmodelformat.so
-lib/openbabel/%%VERSION%%/pdbformat.a
-lib/openbabel/%%VERSION%%/pdbformat.la
lib/openbabel/%%VERSION%%/pdbformat.so
-lib/openbabel/%%VERSION%%/pngformat.a
-lib/openbabel/%%VERSION%%/pngformat.la
+lib/openbabel/%%VERSION%%/pdbqtformat.so
+lib/openbabel/%%VERSION%%/plugin_charges.so
+lib/openbabel/%%VERSION%%/plugin_descriptors.so
+lib/openbabel/%%VERSION%%/plugin_fingerprints.so
+lib/openbabel/%%VERSION%%/plugin_forcefields.so
+lib/openbabel/%%VERSION%%/plugin_ops.so
+lib/openbabel/%%VERSION%%/png2format.so
lib/openbabel/%%VERSION%%/pngformat.so
-lib/openbabel/%%VERSION%%/povrayformat.a
-lib/openbabel/%%VERSION%%/povrayformat.la
lib/openbabel/%%VERSION%%/povrayformat.so
-lib/openbabel/%%VERSION%%/pqrformat.a
-lib/openbabel/%%VERSION%%/pqrformat.la
lib/openbabel/%%VERSION%%/pqrformat.so
-lib/openbabel/%%VERSION%%/pubchem.a
-lib/openbabel/%%VERSION%%/pubchem.la
lib/openbabel/%%VERSION%%/pubchem.so
-lib/openbabel/%%VERSION%%/qchemformat.a
-lib/openbabel/%%VERSION%%/qchemformat.la
+lib/openbabel/%%VERSION%%/pwscfformat.so
lib/openbabel/%%VERSION%%/qchemformat.so
-lib/openbabel/%%VERSION%%/reportformat.a
-lib/openbabel/%%VERSION%%/reportformat.la
lib/openbabel/%%VERSION%%/reportformat.so
-lib/openbabel/%%VERSION%%/rsmiformat.a
-lib/openbabel/%%VERSION%%/rsmiformat.la
lib/openbabel/%%VERSION%%/rsmiformat.so
-lib/openbabel/%%VERSION%%/rxnformat.a
-lib/openbabel/%%VERSION%%/rxnformat.la
lib/openbabel/%%VERSION%%/rxnformat.so
-lib/openbabel/%%VERSION%%/shelxformat.a
-lib/openbabel/%%VERSION%%/shelxformat.la
lib/openbabel/%%VERSION%%/shelxformat.so
-lib/openbabel/%%VERSION%%/smilesformat.a
-lib/openbabel/%%VERSION%%/smilesformat.la
lib/openbabel/%%VERSION%%/smilesformat.so
-lib/openbabel/%%VERSION%%/thermoformat.a
-lib/openbabel/%%VERSION%%/thermoformat.la
+lib/openbabel/%%VERSION%%/svgformat.so
+lib/openbabel/%%VERSION%%/textformat.so
lib/openbabel/%%VERSION%%/thermoformat.so
-lib/openbabel/%%VERSION%%/tinkerformat.a
-lib/openbabel/%%VERSION%%/tinkerformat.la
lib/openbabel/%%VERSION%%/tinkerformat.so
-lib/openbabel/%%VERSION%%/titleformat.a
-lib/openbabel/%%VERSION%%/titleformat.la
lib/openbabel/%%VERSION%%/titleformat.so
-lib/openbabel/%%VERSION%%/turbomoleformat.a
-lib/openbabel/%%VERSION%%/turbomoleformat.la
lib/openbabel/%%VERSION%%/turbomoleformat.so
-lib/openbabel/%%VERSION%%/unichemformat.a
-lib/openbabel/%%VERSION%%/unichemformat.la
lib/openbabel/%%VERSION%%/unichemformat.so
-lib/openbabel/%%VERSION%%/vaspformat.a
-lib/openbabel/%%VERSION%%/vaspformat.la
lib/openbabel/%%VERSION%%/vaspformat.so
-lib/openbabel/%%VERSION%%/viewmolformat.a
-lib/openbabel/%%VERSION%%/viewmolformat.la
lib/openbabel/%%VERSION%%/viewmolformat.so
-lib/openbabel/%%VERSION%%/xedformat.a
-lib/openbabel/%%VERSION%%/xedformat.la
lib/openbabel/%%VERSION%%/xedformat.so
-lib/openbabel/%%VERSION%%/xmlformat.a
-lib/openbabel/%%VERSION%%/xmlformat.la
lib/openbabel/%%VERSION%%/xmlformat.so
-lib/openbabel/%%VERSION%%/xtcformat.a
-lib/openbabel/%%VERSION%%/xtcformat.la
-lib/openbabel/%%VERSION%%/xtcformat.so
-lib/openbabel/%%VERSION%%/xyzformat.a
-lib/openbabel/%%VERSION%%/xyzformat.la
+lib/openbabel/%%VERSION%%/xsfformat.so
lib/openbabel/%%VERSION%%/xyzformat.so
-lib/openbabel/%%VERSION%%/yasaraformat.a
-lib/openbabel/%%VERSION%%/yasaraformat.la
lib/openbabel/%%VERSION%%/yasaraformat.so
-lib/openbabel/%%VERSION%%/zindoformat.a
-lib/openbabel/%%VERSION%%/zindoformat.la
lib/openbabel/%%VERSION%%/zindoformat.so
libdata/pkgconfig/openbabel-2.0.pc
%%DATADIR%%/%%VERSION%%/MACCS.txt
@@ -332,9 +206,12 @@
%%DATADIR%%/%%VERSION%%/UFF.prm
%%DATADIR%%/%%VERSION%%/aromatic.txt
%%DATADIR%%/%%VERSION%%/atomtyp.txt
+%%DATADIR%%/%%VERSION%%/babel_povray3.inc
%%DATADIR%%/%%VERSION%%/bondtyp.txt
%%DATADIR%%/%%VERSION%%/element.txt
%%DATADIR%%/%%VERSION%%/fragments.txt
+%%DATADIR%%/%%VERSION%%/gaff.dat
+%%DATADIR%%/%%VERSION%%/gaff.prm
%%DATADIR%%/%%VERSION%%/ghemical.prm
%%DATADIR%%/%%VERSION%%/isotope-small.txt
%%DATADIR%%/%%VERSION%%/isotope.txt
@@ -360,16 +237,21 @@
%%DATADIR%%/%%VERSION%%/phmodel.txt
%%DATADIR%%/%%VERSION%%/plugindefines.txt
%%DATADIR%%/%%VERSION%%/psa.txt
+%%DATADIR%%/%%VERSION%%/qeq.txt
%%DATADIR%%/%%VERSION%%/resdata.txt
%%DATADIR%%/%%VERSION%%/ringtyp.txt
%%DATADIR%%/%%VERSION%%/space-groups.txt
+%%DATADIR%%/%%VERSION%%/superatom.txt
+%%DATADIR%%/%%VERSION%%/svgformat.script
%%DATADIR%%/%%VERSION%%/torlib.txt
%%DATADIR%%/%%VERSION%%/types.txt
@dirrm %%DATADIR%%/%%VERSION%%
@dirrm %%DATADIR%%
@dirrm lib/openbabel/%%VERSION%%
@dirrm lib/openbabel
+@dirrm lib/cmake/openbabel2
+@dirrm include/openbabel-2.0/openbabel/stereo
@dirrm include/openbabel-2.0/openbabel/math
@dirrm include/openbabel-2.0/openbabel
@dirrm include/openbabel-2.0
-@dirrm include/inchi102
+@dirrm include/inchi
diff -ruN --exclude=CVS /usr/ports/science/gchemutils.orig/Makefile /usr/ports/science/gchemutils/Makefile
--- /usr/ports/science/gchemutils.orig/Makefile 2011-11-22 08:49:25.000000000 -0600
+++ /usr/ports/science/gchemutils/Makefile 2012-02-17 02:46:06.920179419 -0600
@@ -6,25 +6,26 @@
#
PORTNAME= gchemutils
-PORTVERSION= 0.12.10
+PORTVERSION= 0.13.5
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}/0.12
+MASTER_SITE_SUBDIR= ${PORTNAME}/0.13
DISTNAME= gnome-chemistry-utils-${PORTVERSION}
MAINTAINER= [email protected]
COMMENT= C++ classes and Gtk2 widgets related to chemistry
LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \
- openbabel.3:${PORTSDIR}/science/openbabel \
- goffice-0.8.8:${PORTSDIR}/devel/goffice
+ openbabel.4:${PORTSDIR}/science/openbabel \
+ goffice-0.10:${PORTSDIR}/devel/goffice
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
-USE_BZIP2= yes
+USE_XZ= yes
USE_XORG= x11
+USE_GETTEXT= yes
USE_GNOME= gnomehack intlhack gnomedocutils gtk20 libgsf
USE_GMAKE= yes
USE_LDCONFIG= yes
@@ -34,8 +35,6 @@
CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/omf
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
-GCONF_SCHEMAS= gcrystal.schemas gchempaint.schemas gchempaint-arrows.schemas \
- gchemutils.schemas
GLIB_SCHEMAS= org.gnome.gchemutils.crystal.gschema.xml \
org.gnome.gchemutils.gschema.xml \
org.gnome.gchemutils.paint.gschema.xml \
@@ -44,7 +43,7 @@
MAN1= gchem3d.1 gchemcalc.1 gchempaint.1 gchemtable.1 gcrystal.1 \
gspectrum.1
-PLIST_SUB= VER=0.12 GOFFICE=0.8.17 GNUMERIC_VER=1.10.17
+PLIST_SUB= VER=0.14 GOFFICE=0.9.1 GNUMERIC_VER=1.11.1
OPTIONS= XUL "Build browser plugin (requires Xulrunner)" off
@@ -68,5 +67,6 @@
post-patch:
@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/libs/gcp/Makefile.in
+ @${REINPLACE_CMD} -e 's|0\.8|0.10|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/science/gchemutils.orig/distinfo /usr/ports/science/gchemutils/distinfo
--- /usr/ports/science/gchemutils.orig/distinfo 2011-11-22 08:49:25.000000000 -0600
+++ /usr/ports/science/gchemutils/distinfo 2012-02-17 02:10:20.427340281 -0600
@@ -1,2 +1,2 @@
-SHA256 (gnome-chemistry-utils-0.12.10.tar.bz2) = 0b83108f0503ea8635d553d4a94cb3028ea10edb41570ad3bc7b6f9756f1284f
-SIZE (gnome-chemistry-utils-0.12.10.tar.bz2) = 5018000
+SHA256 (gnome-chemistry-utils-0.13.5.tar.xz) = abeb6f29b7d9580911c8d228ccee5a49ce016cfa20f71c695327733959feb4af
+SIZE (gnome-chemistry-utils-0.13.5.tar.xz) = 4245924
diff -ruN --exclude=CVS /usr/ports/science/gchemutils.orig/files/patch-configure /usr/ports/science/gchemutils/files/patch-configure
--- /usr/ports/science/gchemutils.orig/files/patch-configure 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/science/gchemutils/files/patch-configure 2012-02-17 02:14:02.180623631 -0600
@@ -0,0 +1,13 @@
+--- configure~ 2012-02-17 02:11:56.600571728 -0600
++++ configure 2012-02-17 02:13:42.689148117 -0600
+@@ -16622,8 +16622,8 @@ if test "$GCU_API_MINOR_VERSION" = "$GCU
+ STABILITY=""
+ else
+ gcu_is_stable="no"
+- STABILITY_POSTFIX=" ($GCU_API_VER unstable)"
+- STABILITY="-unstable"
++ STABILITY_POSTFIX=""
++ STABILITY=""
+ fi
+
+
diff -ruN --exclude=CVS /usr/ports/science/gchemutils.orig/files/patch-libs-gcu-spectrumdoc.cc /usr/ports/science/gchemutils/files/patch-libs-gcu-spectrumdoc.cc
--- /usr/ports/science/gchemutils.orig/files/patch-libs-gcu-spectrumdoc.cc 2009-07-07 05:56:21.000000000 -0500
+++ /usr/ports/science/gchemutils/files/patch-libs-gcu-spectrumdoc.cc 1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- libs/gcu/spectrumdoc.cc.orig 2009-01-05 14:09:59.000000000 -0500
-+++ libs/gcu/spectrumdoc.cc 2009-05-09 15:06:20.000000000 -0400
-@@ -1898,7 +1899,7 @@ static double logm (double val, double f
-
- static double expm (double val, double f, double offset)
- {
-- return exp10 (-val) * f + offset;
-+ return pow (10, -val) * f + offset;
- }
-
- double (*SpectrumDocument::GetConversionFunction (SpectrumUnitType oldu, SpectrumUnitType newu, double &factor, double &shift)) (double, double, double)
diff -ruN --exclude=CVS /usr/ports/science/gchemutils.orig/files/patch-libs_gcu_application.cc /usr/ports/science/gchemutils/files/patch-libs_gcu_application.cc
--- /usr/ports/science/gchemutils.orig/files/patch-libs_gcu_application.cc 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/science/gchemutils/files/patch-libs_gcu_application.cc 2012-02-17 02:11:29.002931926 -0600
@@ -0,0 +1,10 @@
+--- ./libs/gcu/application.cc~ 2011-11-11 10:50:50.000000000 -0600
++++ ./libs/gcu/application.cc 2012-02-17 02:11:21.421756066 -0600
+@@ -39,6 +39,7 @@
+ #include <cstring>
+ #include <clocale>
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
+ #include <set>
diff -ruN --exclude=CVS /usr/ports/science/gchemutils.orig/pkg-plist /usr/ports/science/gchemutils/pkg-plist
--- /usr/ports/science/gchemutils.orig/pkg-plist 2011-11-22 08:49:25.000000000 -0600
+++ /usr/ports/science/gchemutils/pkg-plist 2012-02-17 03:41:00.621005271 -0600
@@ -28,6 +28,12 @@
lib/gchemutils/%%VER%%/plugins/cml/cml.la
lib/gchemutils/%%VER%%/plugins/cml/cml.so
lib/gchemutils/%%VER%%/plugins/cml/plugin.xml
+lib/gchemutils/%%VER%%/plugins/ctfiles/ctfiles.la
+lib/gchemutils/%%VER%%/plugins/ctfiles/ctfiles.so
+lib/gchemutils/%%VER%%/plugins/ctfiles/plugin.xml
+lib/gchemutils/%%VER%%/plugins/nuts/nuts.la
+lib/gchemutils/%%VER%%/plugins/nuts/nuts.so
+lib/gchemutils/%%VER%%/plugins/nuts/plugin.xml
lib/gchemutils/%%VER%%/plugins/paint/cycles.la
lib/gchemutils/%%VER%%/plugins/paint/cycles.so
lib/gchemutils/%%VER%%/plugins/paint/residues.la
@@ -38,8 +44,6 @@
lib/gchemutils/%%VER%%/plugins/paint/templates.so
lib/gchemutils/%%VER%%/plugins/paint/text.la
lib/gchemutils/%%VER%%/plugins/paint/text.so
-lib/gchemutils/%%VER%%/plugins/paint/wikipedia.la
-lib/gchemutils/%%VER%%/plugins/paint/wikipedia.so
%%GNUMERIC%%lib/gnumeric/%%GNUMERIC_VER%%/plugins/gchemutils/plugin.la
%%GNUMERIC%%lib/gnumeric/%%GNUMERIC_VER%%/plugins/gchemutils/plugin.so
%%GNUMERIC%%lib/gnumeric/%%GNUMERIC_VER%%/plugins/gchemutils/plugin.xml
@@ -48,76 +52,87 @@
lib/goffice/%%GOFFICE%%/plugins/gchemutils/plugin.xml
lib/libgccv-%%VER%%.la
lib/libgccv-%%VER%%.so
-lib/libgccv-%%VER%%.so.12
+lib/libgccv-%%VER%%.so.13
lib/libgcp-%%VER%%.la
lib/libgcp-%%VER%%.so
-lib/libgcp-%%VER%%.so.12
+lib/libgcp-%%VER%%.so.13
+lib/libgcrystal-%%VER%%.la
+lib/libgcrystal-%%VER%%.so
+lib/libgcrystal-%%VER%%.so.13
lib/libgcu-%%VER%%.la
lib/libgcu-%%VER%%.so
-lib/libgcu-%%VER%%.so.12
+lib/libgcu-%%VER%%.so.13
+lib/libgcugtk-%%VER%%.la
+lib/libgcugtk-%%VER%%.so
+lib/libgcugtk-%%VER%%.so.13
%%XUL%%lib/xulrunner/plugins/libmozgcu.la
%%XUL%%lib/xulrunner/plugins/libmozgcu.so
%%XUL%%libexec/chem-viewer
+libexec/babelserver
share/applications/gchem3d-%%VER%%.desktop
share/applications/gchemcalc-%%VER%%.desktop
share/applications/gcrystal-%%VER%%.desktop
share/applications/gchempaint-%%VER%%.desktop
share/applications/gspectrum-%%VER%%.desktop
share/applications/gchemtable-%%VER%%.desktop
-share/gchemutils/%%VER%%/elecprops.xml
-share/gchemutils/%%VER%%/elements.xml
-share/gchemutils/%%VER%%/space-groups.xml
-share/gchemutils/%%VER%%/ui/calc/gchemcalc.ui
-share/gchemutils/%%VER%%/ui/crystal/atoms.ui
-share/gchemutils/%%VER%%/ui/crystal/bonds.ui
-share/gchemutils/%%VER%%/ui/crystal/cell.ui
-share/gchemutils/%%VER%%/ui/crystal/cleavages.ui
-share/gchemutils/%%VER%%/ui/crystal/docprop.ui
-share/gchemutils/%%VER%%/ui/crystal/lines.ui
-share/gchemutils/%%VER%%/ui/crystal/prefs.ui
-share/gchemutils/%%VER%%/ui/crystal/size.ui
-share/gchemutils/%%VER%%/ui/crystal/view-settings.ui
-share/gchemutils/%%VER%%/ui/libgcu/gcuperiodic.ui
-share/gchemutils/%%VER%%/ui/libgcu/image-resolution.ui
-share/gchemutils/%%VER%%/ui/libgcu/image-size.ui
-share/gchemutils/%%VER%%/ui/libgcu/print-setup.ui
-share/gchemutils/%%VER%%/ui/paint/H-pos.ui
-share/gchemutils/%%VER%%/ui/paint/arrow-object.ui
-share/gchemutils/%%VER%%/ui/paint/arrow.png
-share/gchemutils/%%VER%%/ui/paint/docprop.ui
-share/gchemutils/%%VER%%/ui/paint/newfiledlg.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/arrows/arrowtool.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/arrows/curvedarrowtool.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/atoms/orbital-prop.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/atoms/orbital.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/bonds/bond.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/bonds/chain.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/cycles/cycle.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/cycles/cyclen.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/residues/residues.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/selection/group.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/templates/new-template.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/templates/templates.ui
-share/gchemutils/%%VER%%/ui/paint/plugins/text/fontsel.ui
-share/gchemutils/%%VER%%/ui/paint/preferences.ui
-share/gchemutils/%%VER%%/ui/paint/stringdlg.ui
-share/gchemutils/%%VER%%/ui/paint/tools.ui
-share/gchemutils/%%VER%%/ui/paint/zoom.ui
-share/gchemutils/%%VER%%/ui/table/acidity.ui
-share/gchemutils/%%VER%%/ui/table/block.ui
-share/gchemutils/%%VER%%/ui/table/curve.ui
-share/gchemutils/%%VER%%/ui/table/eltpage.ui
-share/gchemutils/%%VER%%/ui/table/family.ui
-share/gchemutils/%%VER%%/ui/table/state-thermometer.ui
-share/gchemutils/%%VER%%/isotopes.xml
-share/gchemutils/%%VER%%/paint/templates/haworth.xml
-share/gchemutils/%%VER%%/paint/templates/templates.xml
-share/gchemutils/%%VER%%/paint/themes/ACS_Document_1996
-share/gchemutils/%%VER%%/paint/themes/Wikipedia
-share/gchemutils/%%VER%%/pixmaps/gcrystal_logo.png
-share/gchemutils/%%VER%%/pixmaps/gchempaint_logo.png
-share/gchemutils/%%VER%%/radii.xml
-share/gchemutils/%%VER%%/residues.xml
+%%DATADIR%%/%%VER%%/elecprops.xml
+%%DATADIR%%/%%VER%%/databases.xml
+%%DATADIR%%/%%VER%%/elements.xml
+%%DATADIR%%/%%VER%%/isotopes.xml
+%%DATADIR%%/%%VER%%/paint/templates/haworth.xml
+%%DATADIR%%/%%VER%%/paint/templates/templates.xml
+%%DATADIR%%/%%VER%%/paint/themes/ACS_Document_1996
+%%DATADIR%%/%%VER%%/paint/themes/Gcp-Modern
+%%DATADIR%%/%%VER%%/paint/themes/Wikipedia
+%%DATADIR%%/%%VER%%/pixmaps/gchempaint_logo.png
+%%DATADIR%%/%%VER%%/pixmaps/gcrystal_logo.png
+%%DATADIR%%/%%VER%%/radii.xml
+%%DATADIR%%/%%VER%%/residues.xml
+%%DATADIR%%/%%VER%%/space-groups.xml
+%%DATADIR%%/%%VER%%/ui/calc/gchemcalc.ui
+%%DATADIR%%/%%VER%%/ui/crystal/atoms.ui
+%%DATADIR%%/%%VER%%/ui/crystal/bonds.ui
+%%DATADIR%%/%%VER%%/ui/crystal/cell.ui
+%%DATADIR%%/%%VER%%/ui/crystal/cleavages.ui
+%%DATADIR%%/%%VER%%/ui/crystal/docprop.ui
+%%DATADIR%%/%%VER%%/ui/crystal/lines.ui
+%%DATADIR%%/%%VER%%/ui/crystal/prefs.ui
+%%DATADIR%%/%%VER%%/ui/crystal/size.ui
+%%DATADIR%%/%%VER%%/ui/crystal/view-settings.ui
+%%DATADIR%%/%%VER%%/ui/libgcu/gcuperiodic.ui
+%%DATADIR%%/%%VER%%/ui/libgcu/image-resolution.ui
+%%DATADIR%%/%%VER%%/ui/libgcu/image-size.ui
+%%DATADIR%%/%%VER%%/ui/libgcu/print-setup.ui
+%%DATADIR%%/%%VER%%/ui/libgcu/stringdlg.ui
+%%DATADIR%%/%%VER%%/ui/libgcu/stringinputdlg.ui
+%%DATADIR%%/%%VER%%/ui/paint/H-pos.ui
+%%DATADIR%%/%%VER%%/ui/paint/arrow-object.ui
+%%DATADIR%%/%%VER%%/ui/paint/arrow.png
+%%DATADIR%%/%%VER%%/ui/paint/docprop.ui
+%%DATADIR%%/%%VER%%/ui/paint/newfiledlg.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/arrows/arrowtool.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/arrows/curvedarrowtool.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/atoms/orbital-prop.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/atoms/orbital.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/bonds/bond.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/bonds/chain.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/cycles/cycle.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/cycles/cyclen.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/residues/residues.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/selection/brackets.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/selection/group.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/templates/new-template.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/templates/templates.ui
+%%DATADIR%%/%%VER%%/ui/paint/plugins/text/fontsel.ui
+%%DATADIR%%/%%VER%%/ui/paint/preferences.ui
+%%DATADIR%%/%%VER%%/ui/paint/tools.ui
+%%DATADIR%%/%%VER%%/ui/paint/zoom.ui
+%%DATADIR%%/%%VER%%/ui/table/acidity.ui
+%%DATADIR%%/%%VER%%/ui/table/block.ui
+%%DATADIR%%/%%VER%%/ui/table/curve.ui
+%%DATADIR%%/%%VER%%/ui/table/eltpage.ui
+%%DATADIR%%/%%VER%%/ui/table/family.ui
+%%DATADIR%%/%%VER%%/ui/table/state-thermometer.ui
share/gnome/help/gchem3d-%%VER%%/C/legal.xml
share/gnome/help/gchem3d-%%VER%%/C/gchem3d-%%VER%%.xml
share/gnome/help/gchem3d-%%VER%%/C/figures/ball-and-stick.png
@@ -262,6 +277,14 @@
share/gnome/help/gchemtable-%%VER%%/C/figures/start.png
share/gnome/help/gchemtable-%%VER%%/C/figures/state.png
share/gnome/help/gchemtable-%%VER%%/C/figures/thermo.png
+share/icons/hicolor/scalable/apps/gchem3d.svg
+share/icons/hicolor/scalable/apps/gchemcalc.svg
+share/icons/hicolor/scalable/apps/gchempaint.svg
+share/icons/hicolor/scalable/apps/gchemtable.svg
+share/icons/hicolor/scalable/apps/gcrystal.svg
+share/icons/hicolor/scalable/apps/gspectrum.svg
+share/icons/hicolor/scalable/mimetypes/application-x-gchempaint.svg
+share/icons/hicolor/scalable/mimetypes/application-x-gcrystal.svg
share/omf/gchem3d-%%VER%%/gchem3d-%%VER%%-C.omf
share/omf/gchemcalc-%%VER%%/gchemcalc-%%VER%%-C.omf
share/omf/gchempaint-%%VER%%/gchempaint-%%VER%%-C.omf
@@ -270,38 +293,6 @@
share/omf/gspectrum-%%VER%%/gspectrum-%%VER%%-C.omf
share/mimelnk/application/x-gchempaint.desktop
share/mimelnk/application/x-gcrystal.desktop
-share/icons/hicolor/128x128/apps/gchem3d.png
-share/icons/hicolor/128x128/apps/gchemcalc.png
-share/icons/hicolor/128x128/apps/gchempaint.png
-share/icons/hicolor/128x128/apps/gchemtable.png
-share/icons/hicolor/128x128/apps/gcrystal.png
-share/icons/hicolor/128x128/apps/gspectrum.png
-share/icons/hicolor/128x128/mimetypes/application-x-gchempaint.png
-share/icons/hicolor/128x128/mimetypes/application-x-gcrystal.png
-share/icons/hicolor/32x32/apps/gchem3d.png
-share/icons/hicolor/32x32/apps/gchemcalc.png
-share/icons/hicolor/32x32/apps/gchempaint.png
-share/icons/hicolor/32x32/apps/gchemtable.png
-share/icons/hicolor/32x32/apps/gcrystal.png
-share/icons/hicolor/32x32/apps/gspectrum.png
-share/icons/hicolor/32x32/mimetypes/application-x-gchempaint.png
-share/icons/hicolor/32x32/mimetypes/application-x-gcrystal.png
-share/icons/hicolor/48x48/apps/gchem3d.png
-share/icons/hicolor/48x48/apps/gchemcalc.png
-share/icons/hicolor/48x48/apps/gchempaint.png
-share/icons/hicolor/48x48/apps/gchemtable.png
-share/icons/hicolor/48x48/apps/gcrystal.png
-share/icons/hicolor/48x48/apps/gspectrum.png
-share/icons/hicolor/48x48/mimetypes/application-x-gchempaint.png
-share/icons/hicolor/48x48/mimetypes/application-x-gcrystal.png
-share/icons/hicolor/72x72/apps/gchem3d.png
-share/icons/hicolor/72x72/apps/gchemcalc.png
-share/icons/hicolor/72x72/apps/gchempaint.png
-share/icons/hicolor/72x72/apps/gchemtable.png
-share/icons/hicolor/72x72/apps/gcrystal.png
-share/icons/hicolor/72x72/apps/gspectrum.png
-share/icons/hicolor/72x72/mimetypes/application-x-gchempaint.png
-share/icons/hicolor/72x72/mimetypes/application-x-gcrystal.png
share/locale/de/LC_MESSAGES/gchemutils-%%VER%%.mo
share/locale/el/LC_MESSAGES/gchemutils-%%VER%%.mo
share/locale/es/LC_MESSAGES/gchemutils-%%VER%%.mo
@@ -362,8 +353,11 @@
@dirrmtry share/mime/chemical
@dirrmtry share/mimelnk/application
@dirrmtry share/mimelnk
+%%GNUMERIC%%@dirrm lib/gnumeric/%%GNUMERIC_VER%%/plugins/gchemutils
@dirrm lib/goffice/%%GOFFICE%%/plugins/gchemutils
@dirrm lib/gchemutils/%%VER%%/plugins/paint
+@dirrm lib/gchemutils/%%VER%%/plugins/nuts
+@dirrm lib/gchemutils/%%VER%%/plugins/ctfiles
@dirrm lib/gchemutils/%%VER%%/plugins/cml
@dirrm lib/gchemutils/%%VER%%/plugins/cif
@dirrm lib/gchemutils/%%VER%%/plugins/cdxml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment