3 files changed, 99 insertions, 17 deletions

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index bb8349b41e43..47c87e2e301f 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pspp
-PORTVERSION=	0.4.0.1
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -17,14 +16,44 @@ COMMENT=	Program for statistical analysis of sampled data
 LIB_DEPENDS=	plot.4:${PORTSDIR}/graphics/plotutils \
 		gslcblas.0:${PORTSDIR}/math/gsl
 
-USE_GNOME=	gnometarget
+OPTIONS=	GUI "Build the PSPPIRE gui" off \
+		PGSQL "Compile in PostgreSQL capability" off
+
+USE_GNOME=	gnometarget libxml2
 USE_PERL5_BUILD=yes
-USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+INFO=		pspp pspp-dev
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
+.if defined(WITH_GUI)
+LIB_DEPENDS+=	gladeui-1:${PORTSDIR}/devel/glade3
+USE_GNOME+=	libglade2
+PLIST_SUB+=	GUI=""
+.else
+CONFIGURE_ARGS+=	--without-gui
+PLIST_SUB+=	GUI="@comment "
+.endif
 
-INFO=		pspp
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+.else
+CONFIGURE_ARGS+=	--without-libpq
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index de7b0fe1d932..db74cedb0131 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,3 +1,3 @@
-MD5 (pspp-0.4.0.1.tar.gz) = a61da2616523589c1494f975cc851eb8
-SHA256 (pspp-0.4.0.1.tar.gz) = 7167c8d21b593d84b006ae372148b2eb8ba8437991980a8363a830d4a9d1dad4
-SIZE (pspp-0.4.0.1.tar.gz) = 1580806
+MD5 (pspp-0.6.0.tar.gz) = 425c4a59d8e85276d3a4ecd6cb0024a3
+SHA256 (pspp-0.6.0.tar.gz) = 8c85ada08e2133846efc221d88b6b3abd9a525587b1630b246a1887120d0804e
+SIZE (pspp-0.6.0.tar.gz) = 2872929
diff --git a/math/pspp/pkg-plist b/math/pspp/pkg-plist
index 7d7536572c23..2fd69d71d4dc 100644
--- a/math/pspp/pkg-plist
+++ b/math/pspp/pkg-plist
@@ -1,7 +1,60 @@
 bin/pspp
-share/locale/en_GB/LC_MESSAGES/pspp.mo
+%%GUI%%bin/psppire
 etc/pspp/devices
-etc/pspp/html-prologue
-etc/pspp/papersize
-etc/pspp/ps-prologue
-@dirrmtry etc/pspp
+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/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
+%%NLS%%share/locale/de/LC_MESSAGES/pspp.mo
+%%NLS%%share/locale/en_GB/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
+%%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%%@dirrm %%DATADIR%%
+@dirrm lib/pspp
+@dirrm etc/pspp/psfonts
+@dirrm etc/pspp