Update to 1.2.2 and remove the obsolete gal2 dependency.

3 files changed, 23 insertions, 7 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index cfd58705bef1..2510064c2063 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
@@ -24,7 +23,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui gal2 libgnomedb libgsf
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui libgnomedb \
+		libgsf
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
@@ -36,6 +36,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 
 PLIST_SUB=	VERSION=${PORTVERSION}-bonobo
 
+MAN1=		gnumeric.1 ssconvert.1
+
 post-patch:
 	@${FIND} ${WRKSRC}/plugins -name "plugin.xml.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|\.la|.so|g'
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 825aceabe6bf..7e3a3b37cb7f 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnumeric-1.2.1.tar.bz2) = 51f0bd5c69e6b6d321909e8bfe2e2c2b
+MD5 (gnome2/gnumeric-1.2.2.tar.bz2) = e6deff35d98794938cb7a3132bb55518
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 99c43ea01fbc..80e0c892538c 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnumeric
+bin/ssconvert
 etc/gconf/gconf.xml.defaults/apps/gnome-settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/%gconf.xml
@@ -306,6 +307,7 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-correlati
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-covariance-ex1.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-covariance-ex2.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-covariance.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-descstats-ex1-options.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-descstats-ex1.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-descstats-ex2.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/analysistools-descstats.png
@@ -383,6 +385,7 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-font-size.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-font-type.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-frame.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-function.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-graphEditor-add.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-graph.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-increase-indent.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/button-increase-precision.png
@@ -428,6 +431,10 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/dialog-filter.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/dialog-graphing.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/dialog-insert-object.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/dialog-summary.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/example-colGraph-modified.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/example-colGraph.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/example-columnSelect.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/example-data.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/file-dialog.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/file-formats-import-list.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/files-csv-export-ex1.png
@@ -445,6 +452,7 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/files-html40-example.pn
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/files-latex-example.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/files-xml-example.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/gnumeric-empty.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/gnumeric-icon-24.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/gnumeric-labelled.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/gnumeric-power-example.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/gnumeric-rearranged.png
@@ -458,6 +466,7 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/label-three.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/label-transparent.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/label-two.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/menu-context-col-row-header.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/menu-context-graph.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/menu-context-grid.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/menu-context-object.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/menu-context-tabs.png
@@ -499,6 +508,14 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/pointer_right.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/pointer_text_edit.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/pointer_zoom_in.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/pointer_zoom_out.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-files.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-font-header.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-font.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-sorting.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-undo.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-various-internal.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-various.png
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/preferences-windows.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-large.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-preview-back.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-preview-first.png
@@ -511,13 +528,10 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-preview-toolbar.p
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-preview-zoomin.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-preview-zoomout.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-preview.png
-share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print-worksheet.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/print.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-preview.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-setup-header-config.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-setup-header.png
-share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-setup-margins.png
-share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-setup-page-1.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-setup-page.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/printing-setup-sheet.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/selection-1.png