5 files changed, 26 insertions, 143 deletions

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 2fbde08af875..17cdc696e44c 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pspp
-PORTVERSION=	0.10.2
-PORTREVISION=	3
+PORTVERSION=	1.0.0
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -51,7 +50,7 @@ PGSQL_CONFIGURE_WITH=	libpq
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|: $$(INSTALL_DATA_HOOKS)|:|' ${WRKSRC}/Makefile.in
+		's|: $$(INSTALL_DATA_HOOKS)|:|g' ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pspp-mode.el \
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index d5758f973172..63f0320ec6ab 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469446928
-SHA256 (pspp-0.10.2.tar.gz) = f77cacae6948689a60f1a5808a5d2e183c1cd0847c7fc6142646c63814c0daa9
-SIZE (pspp-0.10.2.tar.gz) = 7316470
+TIMESTAMP = 1503307920
+SHA256 (pspp-1.0.0.tar.gz) = 1b991ad4f5b2adc8c972de48fdb01d3675cb5ae1fc8d28850f6c0c68a745cb83
+SIZE (pspp-1.0.0.tar.gz) = 7553661
diff --git a/math/pspp/files/patch-src_ui_gui_pspp-sheet-view-column.h b/math/pspp/files/patch-src_ui_gui_pspp-sheet-view-column.h
new file mode 100644
index 000000000000..47cb3c60d225
--- /dev/null
+++ b/math/pspp/files/patch-src_ui_gui_pspp-sheet-view-column.h
@@ -0,0 +1,13 @@
+--- src/ui/gui/pspp-sheet-view-column.h.orig	2017-08-18 10:51:13 UTC
++++ src/ui/gui/pspp-sheet-view-column.h
+@@ -40,6 +40,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef PSEAL
++#define PSEAL(X) X
++#endif
++
+ #define PSPP_TYPE_SHEET_VIEW_COLUMN	     (pspp_sheet_view_column_get_type ())
+ #define PSPP_SHEET_VIEW_COLUMN(obj)	     (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPP_TYPE_SHEET_VIEW_COLUMN, PsppSheetViewColumn))
+ #define PSPP_SHEET_VIEW_COLUMN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPP_TYPE_SHEET_VIEW_COLUMN, PsppSheetViewColumnClass))
diff --git a/math/pspp/pkg-descr b/math/pspp/pkg-descr
index 397ca8b70a19..c1dbed1593ae 100644
--- a/math/pspp/pkg-descr
+++ b/math/pspp/pkg-descr
@@ -6,4 +6,4 @@ PSPP development is ongoing. It already supports a large subset of
 SPSS's transformation language.  Its statistical procedure support is
 currently limited, but growing.
 
-WWW: http://www.gnu.org/software/pspp/pspp.html
+WWW: https://www.gnu.org/software/pspp/pspp.html
diff --git a/math/pspp/pkg-plist b/math/pspp/pkg-plist
index f646441443ea..9315c6604fd4 100644
--- a/math/pspp/pkg-plist
+++ b/math/pspp/pkg-plist
@@ -23,16 +23,12 @@ share/emacs/site-lisp/pspp-mode.el
 %%GUI%%share/glade/catalogs/psppire.xml
 %%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-acr.png
 %%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-dialog.png
-%%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-hbuttonbox.png
 %%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-keypad.png
 %%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-selector.png
-%%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-vbuttonbox.png
 %%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-acr.png
 %%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-dialog.png
-%%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-hbuttonbox.png
 %%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-keypad.png
 %%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-selector.png
-%%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-vbuttonbox.png
 %%GUI%%share/icons/hicolor/16x16/apps/pspp.png
 %%GUI%%share/icons/hicolor/16x16/mimetypes/application-x-spss-por.png
 %%GUI%%share/icons/hicolor/16x16/mimetypes/application-x-spss-sav.png
@@ -67,10 +63,12 @@ share/emacs/site-lisp/pspp-mode.el
 %%NLS%%share/locale/ca/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pspp.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/pspp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/pspp.mo
@@ -81,140 +79,10 @@ share/emacs/site-lisp/pspp-mode.el
 %%NLS%%share/locale/tr/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pspp.mo
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-bivariate-correlation.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-compare-means.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-descriptive-statistics.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-factor-analysis.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-kmeans-cluster.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-non-parametric-statistics.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-realiability.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-regression.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-roc-curve.png
-%%GUI%%%%DATADIR%%/actions/16x16/analyze-univariate-analysis.png
-%%GUI%%%%DATADIR%%/actions/16x16/data-aggregate.png
-%%GUI%%%%DATADIR%%/actions/16x16/data-select-cases.png
-%%GUI%%%%DATADIR%%/actions/16x16/data-sort-cases.png
-%%GUI%%%%DATADIR%%/actions/16x16/data-split-file.png
-%%GUI%%%%DATADIR%%/actions/16x16/data-transpose.png
-%%GUI%%%%DATADIR%%/actions/16x16/data-weight-cases.png
-%%GUI%%%%DATADIR%%/actions/16x16/display-information-external-file.png
-%%GUI%%%%DATADIR%%/actions/16x16/display-information-working-file.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-clear.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-copy.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-cut.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-delete.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-find.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-go-to-case.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-go-to-variable.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-insert-case.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-insert-variable.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-paste.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-redo.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-select-all.png
-%%GUI%%%%DATADIR%%/actions/16x16/edit-undo.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-display-information.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-export-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-import-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-new-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-open-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-print.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-quit.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-recently-used.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-rename-data-set.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-save-as.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-save-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-syntax-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/file-system-data.png
-%%GUI%%%%DATADIR%%/actions/16x16/help-about.png
-%%GUI%%%%DATADIR%%/actions/16x16/help-reference-manual.png
-%%GUI%%%%DATADIR%%/actions/16x16/run-all.png
-%%GUI%%%%DATADIR%%/actions/16x16/run-current-line.png
-%%GUI%%%%DATADIR%%/actions/16x16/run-selection.png
-%%GUI%%%%DATADIR%%/actions/16x16/run-to-end.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-automatic-recode.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-compute.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-count.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-in-to-different-variables.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-in-to-same-variables.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-rank-cases.png
-%%GUI%%%%DATADIR%%/actions/16x16/transform-run-pending.png
-%%GUI%%%%DATADIR%%/actions/16x16/utilities-data-file-comments.png
-%%GUI%%%%DATADIR%%/actions/16x16/utilities-variables.png
-%%GUI%%%%DATADIR%%/actions/16x16/view-font.png
-%%GUI%%%%DATADIR%%/actions/16x16/view-value-labels.png
-%%GUI%%%%DATADIR%%/actions/16x16/windows-minimize-all.png
-%%GUI%%%%DATADIR%%/actions/16x16/windows-split.png
-%%GUI%%%%DATADIR%%/actions/24x24/data-select-cases.png
-%%GUI%%%%DATADIR%%/actions/24x24/data-split-file.png
-%%GUI%%%%DATADIR%%/actions/24x24/data-weight-cases.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-copy.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-cut.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-find.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-go-to-case.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-go-to-variable.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-insert-case.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-insert-variable.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-paste.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-redo.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-select-all.png
-%%GUI%%%%DATADIR%%/actions/24x24/edit-undo.png
-%%GUI%%%%DATADIR%%/actions/24x24/file-export-data.png
-%%GUI%%%%DATADIR%%/actions/24x24/file-open-data.png
-%%GUI%%%%DATADIR%%/actions/24x24/file-print.png
-%%GUI%%%%DATADIR%%/actions/24x24/file-save-data.png
-%%GUI%%%%DATADIR%%/actions/24x24/run-all.png
-%%GUI%%%%DATADIR%%/actions/24x24/transform-compute.png
-%%GUI%%%%DATADIR%%/actions/24x24/utilities-variables.png
-%%GUI%%%%DATADIR%%/actions/24x24/view-value-labels.png
-%%GUI%%%%DATADIR%%/actions/32x32/data-select-cases.png
-%%GUI%%%%DATADIR%%/actions/32x32/data-split-file.png
-%%GUI%%%%DATADIR%%/actions/32x32/data-weight-cases.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-copy.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-cut.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-find.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-go-to-case.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-go-to-variable.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-insert-case.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-insert-variable.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-paste.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-redo.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-select-all.png
-%%GUI%%%%DATADIR%%/actions/32x32/edit-undo.png
-%%GUI%%%%DATADIR%%/actions/32x32/file-export-data.png
-%%GUI%%%%DATADIR%%/actions/32x32/file-open-data.png
-%%GUI%%%%DATADIR%%/actions/32x32/file-print.png
-%%GUI%%%%DATADIR%%/actions/32x32/file-save-data.png
-%%GUI%%%%DATADIR%%/actions/32x32/run-all.png
-%%GUI%%%%DATADIR%%/actions/32x32/transform-compute.png
-%%GUI%%%%DATADIR%%/actions/32x32/utilities-variables.png
-%%GUI%%%%DATADIR%%/actions/32x32/view-value-labels.png
 %%GUI%%%%DATADIR%%/aggregate.ui
 %%GUI%%%%DATADIR%%/autorecode.ui
 %%GUI%%%%DATADIR%%/barchart.ui
 %%GUI%%%%DATADIR%%/binomial.ui
-%%GUI%%%%DATADIR%%/categories/16x16/align-center.png
-%%GUI%%%%DATADIR%%/categories/16x16/align-left.png
-%%GUI%%%%DATADIR%%/categories/16x16/align-right.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-currency-nominal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-currency-ordinal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-currency-scale.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-date-nominal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-date-ordinal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-date-scale.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-nominal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-ordinal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-scale.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-string-nominal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-string-ordinal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-time-nominal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-time-ordinal.png
-%%GUI%%%%DATADIR%%/categories/16x16/measure-time-scale.png
-%%GUI%%%%DATADIR%%/categories/16x16/role-both.png
-%%GUI%%%%DATADIR%%/categories/16x16/role-input.png
-%%GUI%%%%DATADIR%%/categories/16x16/role-none.png
-%%GUI%%%%DATADIR%%/categories/16x16/role-partition.png
-%%GUI%%%%DATADIR%%/categories/16x16/role-split.png
-%%GUI%%%%DATADIR%%/categories/16x16/role-target.png
 %%GUI%%%%DATADIR%%/chi-square.ui
 %%GUI%%%%DATADIR%%/comments.ui
 %%GUI%%%%DATADIR%%/compute.ui
@@ -222,7 +90,6 @@ share/emacs/site-lisp/pspp-mode.el
 %%GUI%%%%DATADIR%%/count.ui
 %%GUI%%%%DATADIR%%/crosstabs.ui
 %%GUI%%%%DATADIR%%/data-editor.ui
-%%GUI%%%%DATADIR%%/data-sheet.ui
 %%GUI%%%%DATADIR%%/descriptives.ui
 %%GUI%%%%DATADIR%%/entry-dialog.ui
 %%GUI%%%%DATADIR%%/examine.ui
@@ -233,12 +100,14 @@ share/emacs/site-lisp/pspp-mode.el
 %%GUI%%%%DATADIR%%/examples/regress.sps
 %%GUI%%%%DATADIR%%/examples/regress_categorical.sps
 %%GUI%%%%DATADIR%%/examples/repairs.sav
+%%GUI%%%%DATADIR%%/examples/t-test.sps
 %%GUI%%%%DATADIR%%/factor.ui
 %%GUI%%%%DATADIR%%/find.ui
 %%GUI%%%%DATADIR%%/frequencies.ui
 %%GUI%%%%DATADIR%%/goto-case.ui
 %%GUI%%%%DATADIR%%/histogram.ui
 %%GUI%%%%DATADIR%%/indep-samples.ui
+%%GUI%%%%DATADIR%%/k-independent.ui
 %%GUI%%%%DATADIR%%/k-means.ui
 %%GUI%%%%DATADIR%%/k-related.ui
 %%GUI%%%%DATADIR%%/ks-one-sample.ui
@@ -246,6 +115,7 @@ share/emacs/site-lisp/pspp-mode.el
 %%GUI%%%%DATADIR%%/means.ui
 %%GUI%%%%DATADIR%%/missing-val-dialog.ui
 %%GUI%%%%DATADIR%%/oneway.ui
+%%GUI%%%%DATADIR%%/options.ui
 %%GUI%%%%DATADIR%%/output-window.ui
 %%GUI%%%%DATADIR%%/paired-samples.ui
 %%GUI%%%%DATADIR%%/pspp.lang
@@ -267,7 +137,8 @@ share/emacs/site-lisp/pspp-mode.el
 %%GUI%%%%DATADIR%%/text-data-import.ui
 %%GUI%%%%DATADIR%%/univariate.ui
 %%GUI%%%%DATADIR%%/val-labs-dialog.ui
-%%GUI%%%%DATADIR%%/var-sheet.ui
 %%GUI%%%%DATADIR%%/var-type-dialog.ui
 %%GUI%%%%DATADIR%%/variable-info.ui
 %%GUI%%%%DATADIR%%/weight.ui
+@comment @dir %%DATADIR%%/actions
+@comment @dir %%DATADIR%%/categories