diff --git a/math/pspp/Makefile b/math/pspp/Makefile index cb15b980efe3..1f494c41970c 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pspp -PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTVERSION= 1.2.0 CATEGORIES= math MASTER_SITES= GNU @@ -16,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= texinfo>0:print/texinfo LIB_DEPENDS= libgslcblas.so:math/gsl -USES= cpe charsetfix gettext-tools gmake iconv localbase libtool \ +USES= cpe charsetfix gettext-tools gmake gnome iconv localbase libtool \ perl5 pkgconfig readline CPE_VENDOR= gnu USE_GNOME= libxml2 @@ -29,14 +28,15 @@ USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" -PORTDOCS= AUTHORS ChangeLog NEWS ONEWS README THANKS TODO +PORTDOCS= AUTHORS ChangeLog NEWS ONEWS README THANKS PORTEXAMPLES= * INFO= pspp pspp-dev OPTIONS_DEFINE= DOCS EXAMPLES GUI NLS PGSQL OPTIONS_SUB= yes -GUI_LIB_DEPENDS= libgladeui-2.so:devel/glade +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 diff --git a/math/pspp/distinfo b/math/pspp/distinfo index 2b1878eb0675..ef47f64356df 100644 --- a/math/pspp/distinfo +++ b/math/pspp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504000065 -SHA256 (pspp-1.0.1.tar.gz) = ba281a2e5d7d40e22f36f07f434a4fbc5be49c6d15740b121c299d024aae1ae5 -SIZE (pspp-1.0.1.tar.gz) = 7556520 +TIMESTAMP = 1541861359 +SHA256 (pspp-1.2.0.tar.gz) = a50e437974cff8d57f41ba87026509c9c383474e52717944ea6565e6ff11f71e +SIZE (pspp-1.2.0.tar.gz) = 7213194 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 deleted file mode 100644 index 47cb3c60d225..000000000000 --- a/math/pspp/files/patch-src_ui_gui_pspp-sheet-view-column.h +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-plist b/math/pspp/pkg-plist index 9315c6604fd4..946859a7414d 100644 --- a/math/pspp/pkg-plist +++ b/math/pspp/pkg-plist @@ -119,7 +119,6 @@ share/emacs/site-lisp/pspp-mode.el %%GUI%%%%DATADIR%%/output-window.ui %%GUI%%%%DATADIR%%/paired-samples.ui %%GUI%%%%DATADIR%%/pspp.lang -%%GUI%%%%DATADIR%%/psppire.gtkrc %%GUI%%%%DATADIR%%/rank.ui %%GUI%%%%DATADIR%%/recode.ui %%GUI%%%%DATADIR%%/regression.ui