From owner-svn-ports-head@freebsd.org Tue Jan 12 11:07:16 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AEE164D2BAC; Tue, 12 Jan 2021 11:07:16 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DFSTJ4XC4z4n7H; Tue, 12 Jan 2021 11:07:16 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E5B52B9F7; Tue, 12 Jan 2021 11:07:16 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10CB7Gjg014204; Tue, 12 Jan 2021 11:07:16 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10CB7FqH014201; Tue, 12 Jan 2021 11:07:15 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202101121107.10CB7FqH014201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Tue, 12 Jan 2021 11:07:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561313 - in head/math/pspp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/math/pspp: . files X-SVN-Commit-Revision: 561313 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 11:07:16 -0000 Author: thierry Date: Tue Jan 12 11:07:15 2021 New Revision: 561313 URL: https://svnweb.freebsd.org/changeset/ports/561313 Log: - Upgrade to 1.4.1 - Install the GUI by default - Add a test target. Deleted: head/math/pspp/files/ Modified: head/math/pspp/Makefile head/math/pspp/distinfo head/math/pspp/pkg-plist Modified: head/math/pspp/Makefile ============================================================================== --- head/math/pspp/Makefile Tue Jan 12 11:05:52 2021 (r561312) +++ head/math/pspp/Makefile Tue Jan 12 11:07:15 2021 (r561313) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pspp -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.1 CATEGORIES= math MASTER_SITES= GNU @@ -16,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= texinfo>0:print/texinfo LIB_DEPENDS= libgslcblas.so:math/gsl -USES= cpe charsetfix gettext-tools gmake gnome iconv localbase libtool \ - perl5 pkgconfig readline +USES= cpe charsetfix gettext-tools gmake gnome iconv localbase \ + libtool perl5 pkgconfig python:3.7+,build readline CPE_VENDOR= gnu USE_GNOME= libxml2 @@ -28,6 +27,7 @@ MAKE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" \ XMLLINT="${LOCALBASE}/bin/xmllint" INSTALL_TARGET= install-strip USE_LDCONFIG= yes +TEST_TARGET= check PLIST_SUB= VERSION="${PORTVERSION}" @@ -36,17 +36,18 @@ PORTEXAMPLES= * INFO= pspp pspp-dev OPTIONS_DEFINE= DOCS EXAMPLES GUI NLS PGSQL +OPTIONS_DEFAULT= GUI OPTIONS_SUB= yes GUI_LIB_DEPENDS= libgladeui-2.so:devel/glade \ libspread-sheet-widget.so:devel/spread-sheet-widget -GUI_RUN_DEPENDS= yelp:x11/yelp -GUI_USES= desktop-file-utils -GUI_USE= gnome=gtk30,gtksourceview3 +GUI_USES= desktop-file-utils shared-mime-info +GUI_USE= gnome=cairo,gtk30,gtksourceview3,pango pkgconfig GUI_VARS= INSTALLS_ICONS=yes -GUI_CONFIGURE_WITH= cairo gui gui-tools +GUI_CONFIGURE_WITH= cairo gui GUI_INSTALL_TARGET= install-icons install-ext-icons +NLS_BUILD_DEPENDS= appstream-glib>0:devel/appstream-glib NLS_USES= gettext-runtime NLS_CONFIGURE_OFF= --disable-nls NLS_MAKE_ARGS_OFF= POFILES="" @@ -54,16 +55,9 @@ NLS_MAKE_ARGS_OFF= POFILES="" PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= libpq -post-patch: - @${REINPLACE_CMD} -e \ - 's|: $$(INSTALL_DATA_HOOKS)|:|g' ${WRKSRC}/Makefile.in - -post-install: - ${INSTALL_DATA} ${WRKSRC}/pspp-mode.el \ - ${STAGEDIR}${PREFIX}/share/emacs/site-lisp - -post-install-GUI-on: - ${RM} -r ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes +pre-configure-GUI-off: + ${REINPLACE_CMD} -e '/language=Glade/d;/j src\/ui\/gui/d' \ + ${WRKSRC}/Makefile.in post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ Modified: head/math/pspp/distinfo ============================================================================== --- head/math/pspp/distinfo Tue Jan 12 11:05:52 2021 (r561312) +++ head/math/pspp/distinfo Tue Jan 12 11:07:15 2021 (r561313) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541861359 -SHA256 (pspp-1.2.0.tar.gz) = a50e437974cff8d57f41ba87026509c9c383474e52717944ea6565e6ff11f71e -SIZE (pspp-1.2.0.tar.gz) = 7213194 +TIMESTAMP = 1610393733 +SHA256 (pspp-1.4.1.tar.gz) = 56b551184f86f2664a1ae8e1558788c40b30cd4fe876dafa4f609d63a0561953 +SIZE (pspp-1.4.1.tar.gz) = 7848393 Modified: head/math/pspp/pkg-plist ============================================================================== --- head/math/pspp/pkg-plist Tue Jan 12 11:05:52 2021 (r561312) +++ head/math/pspp/pkg-plist Tue Jan 12 11:07:15 2021 (r561313) @@ -1,45 +1,30 @@ bin/pspp bin/pspp-convert bin/pspp-dump-sav +bin/pspp-output %%GUI%%bin/psppire -%%GUI%%lib/glade/modules/libglade-psppire.a -%%GUI%%lib/glade/modules/libglade-psppire.so -%%GUI%%lib/glade/modules/libglade-psppire.so.0 -%%GUI%%lib/glade/modules/libglade-psppire.so.0.0.0 -lib/pspp/libpspp.a -lib/pspp/libpspp.so lib/pspp/libpspp-%%VERSION%%.so +lib/pspp/libpspp-core-%%VERSION%%.so lib/pspp/libpspp-core.a lib/pspp/libpspp-core.so -lib/pspp/libpspp-core-%%VERSION%%.so -man/man1/pspp.1.gz -man/man1/psppire.1.gz +lib/pspp/libpspp.a +lib/pspp/libpspp.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 +man/man1/pspp-output.1.gz +man/man1/pspp.1.gz +man/man1/psppire.1.gz +%%GUI%%share/applications/org.fsf.pspp.desktop %%PORTDOCS%%%%DOCSDIR%%/pspp.xml -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-keypad.png -%%GUI%%share/glade/pixmaps/hicolor/16x16/actions/widget-psppire-psppire-selector.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-keypad.png -%%GUI%%share/glade/pixmaps/hicolor/22x22/actions/widget-psppire-psppire-selector.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 @@ -64,7 +49,6 @@ share/emacs/site-lisp/pspp-mode.el %%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 @@ -79,6 +63,8 @@ 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%%share/metainfo/org.fsf.pspp.metainfo.xml +%%GUI%%share/mime/packages/pspp.xml %%GUI%%%%DATADIR%%/aggregate.ui %%GUI%%%%DATADIR%%/autorecode.ui %%GUI%%%%DATADIR%%/barchart.ui @@ -132,12 +118,17 @@ share/emacs/site-lisp/pspp-mode.el %%GUI%%%%DATADIR%%/split-file.ui %%GUI%%%%DATADIR%%/syntax-editor.ui %%GUI%%%%DATADIR%%/t-test.ui -%%GUI%%%%DATADIR%%/transpose.ui %%GUI%%%%DATADIR%%/text-data-import.ui +%%GUI%%%%DATADIR%%/transpose.ui %%GUI%%%%DATADIR%%/univariate.ui %%GUI%%%%DATADIR%%/val-labs-dialog.ui %%GUI%%%%DATADIR%%/var-type-dialog.ui %%GUI%%%%DATADIR%%/variable-info.ui %%GUI%%%%DATADIR%%/weight.ui -@comment @dir %%DATADIR%%/actions -@comment @dir %%DATADIR%%/categories +%%GUI%%@dir %%DATADIR%%/actions +%%GUI%%@dir %%DATADIR%%/categories +%%GUI%%@dir share/icons/hicolor/22x22/apps +%%GUI%%@dir share/icons/hicolor/24x24/apps +%%GUI%%@dir share/icons/hicolor/96x96/apps +%%GUI%%@dir share/icons/hicolor/96x96/mimetypes +%%GUI%%@dir share/icons/hicolor/scalable/mimetypes