3 files changed, 282 insertions, 92 deletions

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index bc5ee37b1389..39e8b0edce8f 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -2,62 +2,58 @@
 # $FreeBSD$
 
 PORTNAME=	pspp
-PORTVERSION=	0.6.2
-PORTREVISION=	12
+PORTVERSION=	0.8.3
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program for statistical analysis of sampled data
 
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	texinfo>0:${PORTSDIR}/print/texinfo
 LIB_DEPENDS=	libplot.so:${PORTSDIR}/graphics/plotutils \
 		libgslcblas.so:${PORTSDIR}/math/gsl
 
-OPTIONS_DEFINE=	GUI PGSQL
-
+USES=		charsetfix gmake iconv libtool perl5 pkgconfig
 USE_GNOME=	libxml2
 USE_PERL5=	build
-USES=		iconv gmake perl5
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
+MAKE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo" \
+		XMLLINT="${LOCALBASE}/bin/xmllint"
 USE_LDCONFIG=	yes
 
-INFO=		pspp pspp-dev
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+INFO=		pspp pspp-dev
 
-.if ${PORT_OPTIONS:MGUI}
-LIB_DEPENDS+=	libgladeui-1.so:${PORTSDIR}/devel/glade3
-RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp
-USE_GNOME+=	libglade2
-CONFIGURE_ARGS+=	--with-gui-tools
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=	--without-gui
-PLIST_SUB+=	GUI="@comment "
-.endif
+OPTIONS_DEFINE=		DOCS GUI NLS PGSQL
+OPTIONS_DEFAULT=	NLS
+OPTIONS_SUB=		yes
+
+GUI_LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3
+GUI_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+GUI_USES=		desktop-file-utils
+GUI_USE=		gnome=gtksourceview2,libglade2
+GUI_CONFIGURE_WITH=	cairo gui gui-tools
+GUI_INSTALL_TARGET=	install-strip install-icons install-ext-icons
+GUI_INSTALL_TARGET_OFF=	install-strip
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	libpq
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-.else
-CONFIGURE_ARGS+=	--without-libpq
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUI}
+INSTALLS_ICONS=	yes
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^install-exec-am:/s|install-exec-local||' \
-		${WRKSRC}/gl/Makefile.in
-post-install:
-	@${TOUCH} ${PREFIX}/lib/pspp/.keep_me
+	@${REINPLACE_CMD} -e \
+		's|: $$(INSTALL_DATA_HOOKS)|:|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index 346236c0eeb1..009ee20021b1 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pspp-0.6.2.tar.gz) = ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385
-SIZE (pspp-0.6.2.tar.gz) = 3375748
+SHA256 (pspp-0.8.3.tar.gz) = adb8de281098b0d8632a8f2ea2af6514100786cf946f07a3c268d4baff15316f
+SIZE (pspp-0.8.3.tar.gz) = 6247760
diff --git a/math/pspp/pkg-plist b/math/pspp/pkg-plist
index 5a8ef3039162..2ca0877b412d 100644
--- a/math/pspp/pkg-plist
+++ b/math/pspp/pkg-plist
@@ -1,31 +1,22 @@
 bin/pspp
+bin/pspp-convert
+bin/pspp-dump-sav
 %%GUI%%bin/psppire
-etc/pspp/devices
-etc/pspp/psfonts/Courier-Bold.afm
-etc/pspp/psfonts/Courier-BoldOblique.afm
-etc/pspp/psfonts/Courier-Oblique.afm
-etc/pspp/psfonts/Courier.afm
-etc/pspp/psfonts/Helvetica-Bold.afm
-etc/pspp/psfonts/Helvetica-BoldOblique.afm
-etc/pspp/psfonts/Helvetica-Oblique.afm
-etc/pspp/psfonts/Helvetica.afm
-etc/pspp/psfonts/Times-Bold.afm
-etc/pspp/psfonts/Times-BoldItalic.afm
-etc/pspp/psfonts/Times-Italic.afm
-etc/pspp/psfonts/Times-Roman.afm
 %%GUI%%lib/glade3/modules/libglade-psppire.a
-%%GUI%%lib/glade3/modules/libglade-psppire.la
 %%GUI%%lib/glade3/modules/libglade-psppire.so
 %%GUI%%lib/glade3/modules/libglade-psppire.so.0
-lib/pspp/.keep_me
-%%GUI%%lib/pspp/libpsppire.a
-%%GUI%%lib/pspp/libpsppire.la
-%%GUI%%lib/pspp/libpsppire.so
-%%GUI%%lib/pspp/libpsppire.so.0
-%%GUI%%lib/pspp/libpsppwidgets.a
-%%GUI%%lib/pspp/libpsppwidgets.la
-%%GUI%%lib/pspp/libpsppwidgets.so
-%%GUI%%lib/pspp/libpsppwidgets.so.0
+%%GUI%%lib/glade3/modules/libglade-psppire.so.0.0.0
+lib/pspp/libpspp.a
+lib/pspp/libpspp.so
+lib/pspp/libpspp-%%VERSION%%.so
+lib/pspp/libpspp-core.a
+lib/pspp/libpspp-core.so
+lib/pspp/libpspp-core-%%VERSION%%.so
+man/man1/pspp-convert.1.gz
+man/man1/pspp-dump-sav.1.gz
+%%GUI%%share/appdata/pspp.appdata.xml
+%%GUI%%share/applications/pspp.desktop
+%%PORTDOCS%%%%DOCSDIR%%/pspp.xml
 %%GUI%%share/glade3/catalogs/psppire.xml
 %%GUI%%share/glade3/pixmaps/16x16/psppire-acr.png
 %%GUI%%share/glade3/pixmaps/16x16/psppire-dialog.png
@@ -39,41 +30,244 @@ lib/pspp/.keep_me
 %%GUI%%share/glade3/pixmaps/22x22/psppire-keypad.png
 %%GUI%%share/glade3/pixmaps/22x22/psppire-selector.png
 %%GUI%%share/glade3/pixmaps/22x22/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
+%%GUI%%share/icons/hicolor/16x16/mimetypes/application-x-spss-sps.png
+%%GUI%%share/icons/hicolor/16x16/mimetypes/application-x-spss-zsav.png
+%%GUI%%share/icons/hicolor/22x22/apps/pspp.png
+%%GUI%%share/icons/hicolor/22x22/mimetypes/application-x-spss-por.png
+%%GUI%%share/icons/hicolor/22x22/mimetypes/application-x-spss-sav.png
+%%GUI%%share/icons/hicolor/22x22/mimetypes/application-x-spss-sps.png
+%%GUI%%share/icons/hicolor/22x22/mimetypes/application-x-spss-zsav.png
+%%GUI%%share/icons/hicolor/24x24/apps/pspp.png
+%%GUI%%share/icons/hicolor/24x24/mimetypes/application-x-spss-por.png
+%%GUI%%share/icons/hicolor/24x24/mimetypes/application-x-spss-sav.png
+%%GUI%%share/icons/hicolor/24x24/mimetypes/application-x-spss-sps.png
+%%GUI%%share/icons/hicolor/24x24/mimetypes/application-x-spss-zsav.png
+%%GUI%%share/icons/hicolor/256x256/apps/pspp.png
+%%GUI%%share/icons/hicolor/256x256/mimetypes/application-x-spss-por.png
+%%GUI%%share/icons/hicolor/256x256/mimetypes/application-x-spss-sav.png
+%%GUI%%share/icons/hicolor/256x256/mimetypes/application-x-spss-sps.png
+%%GUI%%share/icons/hicolor/256x256/mimetypes/application-x-spss-zsav.png
+%%GUI%%share/icons/hicolor/32x32/apps/pspp.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/application-x-spss-por.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/application-x-spss-sav.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/application-x-spss-sps.png
+%%GUI%%share/icons/hicolor/32x32/mimetypes/application-x-spss-zsav.png
+%%GUI%%share/icons/hicolor/48x48/apps/pspp.png
+%%GUI%%share/icons/hicolor/48x48/mimetypes/application-x-spss-por.png
+%%GUI%%share/icons/hicolor/48x48/mimetypes/application-x-spss-sav.png
+%%GUI%%share/icons/hicolor/48x48/mimetypes/application-x-spss-sps.png
+%%GUI%%share/icons/hicolor/48x48/mimetypes/application-x-spss-zsav.png
+%%GUI%%share/icons/hicolor/scalable/apps/pspp.svg
+%%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/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/ja/LC_MESSAGES/pspp.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/pspp.mo
-%%GUI%%%%DATADIR%%/crosstabs.glade
-%%GUI%%%%DATADIR%%/data-editor.glade
-%%GUI%%%%DATADIR%%/date-scale.png
-%%GUI%%%%DATADIR%%/descriptives-dialog.glade
-%%GUI%%%%DATADIR%%/examine.glade
-%%GUI%%%%DATADIR%%/frequencies.glade
-%%GUI%%%%DATADIR%%/goto-variable.png
-%%GUI%%%%DATADIR%%/insert-case.png
-%%GUI%%%%DATADIR%%/insert-variable.png
-%%GUI%%%%DATADIR%%/message-dialog.glade
-%%GUI%%%%DATADIR%%/nominal.png
-%%GUI%%%%DATADIR%%/oneway.glade
-%%GUI%%%%DATADIR%%/ordinal.png
-%%GUI%%%%DATADIR%%/output-viewer.glade
-%%GUI%%%%DATADIR%%/psppicon.png
-%%GUI%%%%DATADIR%%/psppire.glade
-%%GUI%%%%DATADIR%%/pspplogo.png
-%%GUI%%%%DATADIR%%/rank.glade
-%%GUI%%%%DATADIR%%/recent-dialogs.png
-%%GUI%%%%DATADIR%%/recode.glade
-%%GUI%%%%DATADIR%%/regression.glade
-%%GUI%%%%DATADIR%%/scale.png
-%%GUI%%%%DATADIR%%/select-cases.png
+%%NLS%%share/locale/sl/LC_MESSAGES/pspp.mo
+%%NLS%%share/locale/uk/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%%/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%%/compute.ui
+%%GUI%%%%DATADIR%%/correlation.ui
+%%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
+%%GUI%%%%DATADIR%%/examples/descript.sps
+%%GUI%%%%DATADIR%%/examples/grid.sps
+%%GUI%%%%DATADIR%%/examples/hotel.sav
+%%GUI%%%%DATADIR%%/examples/physiology.sav
+%%GUI%%%%DATADIR%%/examples/regress.sps
+%%GUI%%%%DATADIR%%/examples/regress_categorical.sps
+%%GUI%%%%DATADIR%%/examples/repairs.sav
+%%GUI%%%%DATADIR%%/factor.ui
+%%GUI%%%%DATADIR%%/find.ui
+%%GUI%%%%DATADIR%%/frequencies.ui
+%%GUI%%%%DATADIR%%/goto-case.ui
+%%GUI%%%%DATADIR%%/indep-samples.ui
+%%GUI%%%%DATADIR%%/k-means.ui
+%%GUI%%%%DATADIR%%/k-related.ui
+%%GUI%%%%DATADIR%%/ks-one-sample.ui
+%%GUI%%%%DATADIR%%/logistic.ui
+%%GUI%%%%DATADIR%%/means.ui
+%%GUI%%%%DATADIR%%/missing-val-dialog.ui
+%%GUI%%%%DATADIR%%/oneway.ui
+%%GUI%%%%DATADIR%%/output-viewer.ui
+%%GUI%%%%DATADIR%%/paired-samples.ui
+%%GUI%%%%DATADIR%%/pspp.lang
+%%GUI%%%%DATADIR%%/psppire.gtkrc
+%%GUI%%%%DATADIR%%/psppire.ui
+%%GUI%%%%DATADIR%%/rank.ui
+%%GUI%%%%DATADIR%%/recode.ui
+%%GUI%%%%DATADIR%%/regression.ui
+%%GUI%%%%DATADIR%%/reliability.ui
+%%GUI%%%%DATADIR%%/roc.ui
+%%GUI%%%%DATADIR%%/runs.ui
+%%GUI%%%%DATADIR%%/select-cases.ui
+%%GUI%%%%DATADIR%%/sort.ui
 %%GUI%%%%DATADIR%%/splash.png
-%%GUI%%%%DATADIR%%/split-file.png
-%%GUI%%%%DATADIR%%/string.png
-%%GUI%%%%DATADIR%%/syntax-editor.glade
-%%GUI%%%%DATADIR%%/t-test.glade
-%%GUI%%%%DATADIR%%/text-data-import.glade
-%%GUI%%%%DATADIR%%/value-labels.png
-%%GUI%%%%DATADIR%%/weight-cases.png
+%%GUI%%%%DATADIR%%/split-file.ui
+%%GUI%%%%DATADIR%%/syntax-editor.ui
+%%GUI%%%%DATADIR%%/t-test.ui
+%%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%%@dirrm %%DATADIR%%/examples
+%%GUI%%@dirrm %%DATADIR%%/categories/16x16
+%%GUI%%@dirrm %%DATADIR%%/categories
+%%GUI%%@dirrm %%DATADIR%%/actions/32x32
+%%GUI%%@dirrm %%DATADIR%%/actions/24x24
+%%GUI%%@dirrm %%DATADIR%%/actions/16x16
+%%GUI%%@dirrm %%DATADIR%%/actions
 %%GUI%%@dirrm %%DATADIR%%
+%%GUI%%@dirrm share/glade3/pixmaps/22x22
+%%GUI%%@dirrm share/glade3/pixmaps/16x16
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%GUI%%@dirrmtry share/appdata
 @dirrm lib/pspp
-@dirrm etc/pspp/psfonts
-@dirrm etc/pspp