git: 9078f1fd0d11 - main - math/pspp: update to version 1.6.1

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Sun, 26 Jun 2022 21:56:31 UTC
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9078f1fd0d119979eb326af0876e179b0aa276af

commit 9078f1fd0d119979eb326af0876e179b0aa276af
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-06-26 21:55:59 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-06-26 21:55:59 +0000

    math/pspp: update to version 1.6.1
---
 math/pspp/Makefile  | 13 +++++-----
 math/pspp/distinfo  |  6 ++---
 math/pspp/pkg-plist | 68 ++++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 554930f4b423..fd01b4e86968 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,8 +1,7 @@
 # Created by: Andrew L. Neporada <andrew@chg.ru>
 
 PORTNAME=	pspp
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTVERSION=	1.6.1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -12,7 +11,8 @@ COMMENT=	Program for statistical analysis of sampled data
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	texinfo>0:print/texinfo
+BUILD_DEPENDS=	p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		texinfo>0:print/texinfo
 LIB_DEPENDS=	libgslcblas.so:math/gsl
 
 USES=		cpe charsetfix gettext-tools gmake gnome iconv localbase	\
@@ -22,17 +22,18 @@ CPE_VENDOR=	gnu
 USE_GNOME=	libxml2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib -lxml2
+CONFIGURE_ENV=	PYTHON3=${PYTHON_CMD}
 MAKE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo" \
 		XMLLINT="${LOCALBASE}/bin/xmllint"
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-PLIST_SUB=	VERSION="${PORTVERSION}"
+LDFLAGS+=	-L${LOCALBASE}/lib -lxml2
 
+INFO=		pspp pspp-dev
+PLIST_SUB=	VERSION="${PORTVERSION}"
 PORTDOCS=	AUTHORS ChangeLog NEWS ONEWS README THANKS
 PORTEXAMPLES=	*
-INFO=		pspp pspp-dev
 
 OPTIONS_DEFINE=		DOCS EXAMPLES GUI NLS PGSQL
 OPTIONS_DEFAULT=	GUI
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index 8b3366f79e8c..76ae36c610ca 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610393733
-SHA256 (pspp-1.4.1.tar.gz) = 56b551184f86f2664a1ae8e1558788c40b30cd4fe876dafa4f609d63a0561953
-SIZE (pspp-1.4.1.tar.gz) = 7848393
+TIMESTAMP = 1656248369
+SHA256 (pspp-1.6.1.tar.gz) = 8a32723eba80b200be73552e7da5807d2bb8e655c1d03bd3903c5fea43100e62
+SIZE (pspp-1.6.1.tar.gz) = 9249022
diff --git a/math/pspp/pkg-plist b/math/pspp/pkg-plist
index 29a1a3823b6f..bcbac26f7d69 100644
--- a/math/pspp/pkg-plist
+++ b/math/pspp/pkg-plist
@@ -14,9 +14,9 @@ man/man1/pspp-dump-sav.1.gz
 man/man1/pspp-output.1.gz
 man/man1/pspp.1.gz
 man/man1/psppire.1.gz
-%%GUI%%share/applications/org.fsf.pspp.desktop
+%%GUI%%share/applications/org.gnu.pspp.desktop
 %%PORTDOCS%%%%DOCSDIR%%/pspp.xml
-%%GUI%%share/icons/hicolor/16x16/apps/pspp.png
+%%GUI%%share/icons/hicolor/16x16/apps/org.gnu.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
@@ -29,22 +29,71 @@ man/man1/psppire.1.gz
 %%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/apps/org.gnu.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/apps/org.gnu.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/apps/org.gnu.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
+%%GUI%%share/icons/hicolor/scalable/apps/org.gnu.pspp.svg
+%%PORTDOCS%%share/info/dir
+%%PORTDOCS%%share/info/pspp-figures/aggregate.png
+%%PORTDOCS%%share/info/pspp-figures/autorecode.png
+%%PORTDOCS%%share/info/pspp-figures/chisquare.png
+%%PORTDOCS%%share/info/pspp-figures/compute.png
+%%PORTDOCS%%share/info/pspp-figures/count.png
+%%PORTDOCS%%share/info/pspp-figures/crosstabs.png
+%%PORTDOCS%%share/info/pspp-figures/descriptives.png
+%%PORTDOCS%%share/info/pspp-figures/flip.png
+%%PORTDOCS%%share/info/pspp-figures/frequencies.png
+%%PORTDOCS%%share/info/pspp-figures/independent-samples-t.png
+%%PORTDOCS%%share/info/pspp-figures/matrix-print.png
+%%PORTDOCS%%share/info/pspp-figures/means.png
+%%PORTDOCS%%share/info/pspp-figures/one-sample-t.png
+%%PORTDOCS%%share/info/pspp-figures/reliability.png
+%%PORTDOCS%%share/info/pspp-figures/select-if.png
+%%PORTDOCS%%share/info/pspp-figures/show-system.png
+%%PORTDOCS%%share/info/pspp-figures/sort-cases.png
+%%PORTDOCS%%share/info/pspp-figures/split.png
+%%PORTDOCS%%share/info/pspp-figures/temporary.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial1.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial2.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial2a.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial2b.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial3.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial4.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial5.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial5a.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial5b.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial6.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial7.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial7a.png
+%%PORTDOCS%%share/info/pspp-figures/tutorial7b.png
+%%PORTDOCS%%share/info/pspp-figures/weight.png
+%%PORTDOCS%%share/info/screenshots/autorecode-ad.png
+%%PORTDOCS%%share/info/screenshots/chisquare-ad.png
+%%PORTDOCS%%share/info/screenshots/compute-ad.png
+%%PORTDOCS%%share/info/screenshots/count-ad.png
+%%PORTDOCS%%share/info/screenshots/count-define-ad.png
+%%PORTDOCS%%share/info/screenshots/crosstabs-ad.png
+%%PORTDOCS%%share/info/screenshots/define-groups-t-ad.png
+%%PORTDOCS%%share/info/screenshots/descriptives-ad.png
+%%PORTDOCS%%share/info/screenshots/frequencies-ad.png
+%%PORTDOCS%%share/info/screenshots/independent-samples-t-ad.png
+%%PORTDOCS%%share/info/screenshots/one-sample-t-ad.png
+%%PORTDOCS%%share/info/screenshots/reliability-ad.png
+%%PORTDOCS%%share/info/screenshots/sort-ad.png
+%%PORTDOCS%%share/info/screenshots/sort-simple-ad.png
+%%PORTDOCS%%share/info/screenshots/split-status-bar-ad.png
 %%NLS%%share/locale/ca/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pspp.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pspp.mo
@@ -63,8 +112,8 @@ man/man1/psppire.1.gz
 %%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%%share/metainfo/org.fsf.pspp.metainfo.xml
-%%GUI%%share/mime/packages/pspp.xml
+%%GUI%%share/metainfo/org.gnu.pspp.metainfo.xml
+%%GUI%%share/mime/packages/org.gnu.pspp.xml
 %%GUI%%%%DATADIR%%/aggregate.ui
 %%GUI%%%%DATADIR%%/autorecode.ui
 %%GUI%%%%DATADIR%%/barchart.ui
@@ -81,7 +130,9 @@ man/man1/psppire.1.gz
 %%GUI%%%%DATADIR%%/examine.ui
 %%GUI%%%%DATADIR%%/examples/descript.sps
 %%GUI%%%%DATADIR%%/examples/grid.sps
+%%GUI%%%%DATADIR%%/examples/horticulture.sav
 %%GUI%%%%DATADIR%%/examples/hotel.sav
+%%GUI%%%%DATADIR%%/examples/personnel.sav
 %%GUI%%%%DATADIR%%/examples/physiology.sav
 %%GUI%%%%DATADIR%%/examples/regress.sps
 %%GUI%%%%DATADIR%%/examples/regress_categorical.sps
@@ -116,6 +167,7 @@ man/man1/psppire.1.gz
 %%GUI%%%%DATADIR%%/sort.ui
 %%GUI%%%%DATADIR%%/splash.png
 %%GUI%%%%DATADIR%%/split-file.ui
+%%GUI%%%%DATADIR%%/spreadsheet-import.ui
 %%GUI%%%%DATADIR%%/syntax-editor.ui
 %%GUI%%%%DATADIR%%/t-test.ui
 %%GUI%%%%DATADIR%%/text-data-import.ui