Update to PSPP 0.6.1.

Implement x11 (on by default) and pgsql (off by default) options.

Changes from 0.6.0 to 0.6.1:

  * Statistical bug fixes:
    - Report correct standardized regression coefficients in linear
      regression output (bug #23567).

  * Bug fixes that affect PSPP and PSPPIRE:
    - Avoid crash with pie charts (bug #24014).
    - Don't append % to count totals (bug #24003).
    - Don't crash on bad input (bug #24031).
    - Don't crash if "end data." is not left aligned (bug #24115).
    - Change default workspace value to 64 MB, to avoid unnecessary
      disk accesses on modern machines.

  * PSPPIRE bug fixes:
    - Add ".sav" or ".por" suffix to filename when saving with Save_As
      (bug #23137).
    - Make it possible to reopen the output window on Windows (bug
      #24033).
    - A POSIX regular expression library is now included and used
      automatically if the host does not have one or has one that is
      inadequate.

  * Build fixes and changes:
    - Work around bug in GSL that prevented build with recent GCC
      versions without manually adding -fgnu89-inline to CFLAGS.
    - Also warn about missing prerequisites as we encounter them (bug
      #24445).
    - Distribute necessary files to allow users working from the
      distributed tarball to configure with --enable-gui-tools.
    - Append $(EXEEXT_FOR_BUILD) to output file name when building
      q2c, fixing build problems on Windows.
    - GSL 1.8 or later is now required.
    - Build errors with --enable-relocatable were fixed.

  * The German translations were removed, since native German speakers
    found them too poor to be useful.

Changes from 0.4.0 to 0.6.0:

  * The PSPP license is now version 3 or later of the GNU General
    Public License.  Previously, it was version 2 or later.

  * PSPP now has a graphical interface, called PSPPIRE.  This
    interface allows you to enter data and variable definitions
    interactively.  Commands may be executed in syntax form, or by
    using the interactive dialog boxes available from the dropdown
    menus.

  * A few sample syntax files are now included in the `examples'
    directory.

  * Numerous major and minor bugs have been fixed.

  Build changes:

    * The INSTALL file now reflects the details of how to install
      PSPP.  It is a tailored version of the generic installation
      instructions, instead of a verbatim copy.

    * iconv, which is ordinarily installed as part of a Unix-like
      system, is now required.  If you don't have it already, you can
      install GNU libiconv (http://www.gnu.org/software/libiconv/).

    * libxml2 and zlib are new optional dependencies.  They are
      required to use PSPP's support for reading Gnumeric files.

  Statistical procedure changes:

    * REGRESSION is a new procedure for fitting linear models to data
      via least-squares estimation.

    * NPAR TESTS is a new procedure for non-parametric tests.  In this
      release, it supports binomial and chi-square tests.

    * RANK is a new procedure to rank variables.  It supports numerous
      forms of ranking.

    * FREQUENCIES can now output histograms and pie charts.  These
      features were present in earlier releases, but not documented.

  User interface changes:

    * In many situations where PSPP once terminated with a fatal
      error, PSPP now recovers and continues execution.

    * PSPP is now able to start up and run even if it cannot find its
      configuration files.

    * Journaling of interactive commands to a disk file is now
      implemented.  By default, journaling is enabled, to a file named
      `pspp.jnl' in the current directory.  SET JOURNAL may be used to
      control journaling.

    * The use of `+' between syntax file names on the command line to
      prevent the dictionary from being cleared between their
      executions is no longer supported.  All syntax files are now
      executed as if `+' had been specified.

    * The -d/--define and -u/--undef command line options are no
      longer supported.  Instead, use /usr/bin/env or shell primitives
      to define or clear environment variables before invoking PSPP.

    * If a syntax file named named `rc' is found in a configuration
      directory (such as $HOME/.pspp), it is executed before any
      syntax file specified on the command line.  The -r or
      --no-statrc command line option may be used to disable this
      behavior.

  Output changes:

    * Output configuration options have changed.  Please refer to the
      manual for a full description of the available options.

      In consequence, you will need to reinstall your "devices" file.
      "make install" will do this for you.

    * Most error messages are now written to PSPP output files by
      default.  SET ERROR can be used to disable this behavior.

    * When invoked interactively, PSPP now by default produces output
      on the terminal, piping it through the "more" program.
      Previously, by default output was written only to file
      pspp.list.  On most terminals, the page length used for output
      automatically adapts to the terminal size, even if the terminal
      is resized.

    * ASCII driver:
      - This driver now supports charts in output.  Charts are written
        as separate files that the main output file refers to.  By
        default, charts are written in PNG format to files named
        pspp-1.png, pspp-2.png, and so on.
      - Configurations are provided that use VT100 (and xterm)
        line-drawing characters in tables.  The option "-o list-vt100"
        requests use of this device for output to pspp.list.

    * PostScript driver:

      - The default paper size is now determined using the PAPERSIZE
        environment variable, or the LC_PAPER locale category on
        systems that support it.  If these are not set, the default is
        now A4, instead of US letter.  To make US letter the default,
        set PAPERSIZE to "letter" in your environment.
      - Font metrics are now read from AFM files, instead of
        Groff-format metrics files.  PostScript fonts can now be
        embedded in output.
        In consequence, you will need to install an AFM file for each
        font used in PostScript output.  "make install" will install
        AFM files for the standard PostScript fonts, including the
        ones that the PostScript driver uses by default.
      - Standard paper sizes no longer need to be specified through a
        configuration file.  The "papersize" configuration file is no
        longer needed, or supported.
      - The PostScript prologue is no longer obtained from the
        "ps-prologue" configuration file.  This configuration file is
        no longer needed, or supported.

    * HTML driver:
      - The HTML prologue is no longer obtained from the
        "html-prologue" configuration file.  This configuration file
        is no longer needed, or supported.

  Command language changes:

    * The following commands are new:
      - GET DATA, which currently supports reading Gnumeric files and
        text data files.  It will be extended later to read other
        types of foreign data.
      - CD, to change the current directory.
      - INSERT, to execute a syntax file.
      - DELETE VARIABLES, to remove variables from the active file
        dictionary.
      - ADD DOCUMENT, to add text to active file documents.
      - CLOSE FILE HANDLE (a PSPP extension; see below).
      - XEXPORT, a PSPP extension that is a transformation equivalent
        to EXPORT.

    * The following functions for transformation expressions are new:
      - DATEDIFF, for computing the difference of two dates.
      - DATESUM, for advancing a date by a specified duration.
      - VALUELABEL, to obtain the value label for a value.

    * PSPP now supports very long string variables (over 255 bytes
      long).

    * MATCH FILES now supports the FIRST and LAST subcommands.

    * Previous versions of PSPP prohibited using commands to both read and
      write a single file at the same time.  Now, PSPP allows this, and
      the new version of the file atomically replaces the old version.

    * The following commands are no longer available.  They will be
      re-implemented in a later release:
      - CLEAR TRANSFORMATIONS
      - MATRIX DATA
      - REPEATING DATA

    * The PROCESS IF command, which was deprecated, has been removed.
      You may replace any usage of it by SELECT IF following
      TEMPORARY, which has the same effect.

    * The output format for variables created by VECTOR may now be
      specified as part of the VECTOR syntax.

  "Scratch files", a new PSPP extension:

    A scratch file, like a system file, consists of a dictionary and
    any number of cases.  Small scratch files are stored in memory;
    one that grows too large is written to disk.  By default, any file
    handle whose name begins with # is assumed to refer to a scratch
    file.

    Scratch files can be used just about anywhere a system or portable
    file can be used.  Also, portable files are now allowed in most
    places that system files were allowed in previous PSPP version.

    A new CLOSE FILE HANDLE command allows the storage associated with
    scratch files to be freed.  It also allows file handles to be
    reassigned to new files.

    For more information on scratch files, refer to the "File Handles"
    section in the PSPP manual.  For specifics of what commands now
    allow what kinds of files to be specified, refer to the
    documentation on those particular commands.

  Data access changes:

    * Binary formats and IBM/360 formats, including ASCII/EBCDIC
      translation, are now supported.  Use FILE HANDLE to specify the
      format of these files.

    * Little-endian, big-endian, and VAX-endian formats are now
      supported for integer binary formats when reading and writing
      data files.  The new RIB and WIB subcommands on the SET command
      control endianness of integer data.  The default is the host's
      native endianness.

    * IEEE 754, VAX, and IBM hexadecimal formats are now supported for
      floating point binary formats when reading and writing data
      files.  The new RRB and WRB subcommands on the SET command
      control the floating point format.  The default is the host's
      native floating point format.

    * DATA LIST now supports the SKIP subcommand, to skip records at
      the beginning of a file.  For compatibility, DATA LIST now
      treats N format as F format for FREE and LIST format input.

    * The SAVE and XSAVE commands now support the UNSELECTED,
      PERMISSIONS, NAMES, and MAP subcommands.

    * The EXPORT command has been re-implemented to obtain better
      results.  Support for the UNSELECTED, DIGITS, and TYPE
      subcommands has been added.

    * For compatibility, PRINT now inserts a space at the beginning of
      every output line, even lines that would otherwise be blank,
      when OUTFILE is specified.  (The behavior of WRITE is
      unchanged.)

    * For compatibility, PRINT EJECT now inserts the digit `1' at the
      beginning of each line that should begin a new page.

    * For compatibility, WRITE now outputs the system-missing value as
      a field filled with spaces.  Binary formats are an exception.
      (The behavior of PRINT is unchanged.)

  Documentation:

    * Input and output format descriptions have been rewritten.  They
      now precisely describe what is accepted on input and written on
      output.

    * The descriptions of the PSPP system and portable file formats
      have been extensively revised and improved.

Changes from 0.3.0 to 0.4.0:

  Newly implemented commands and statistical features:
    * EXAMINE, including its graphing features.
    * FREQUENCIES now supports percentiles.
    * ONEWAY.
    * PERMISSIONS.
    * SHOW.
    * SORT CASES now sorts stably, that is, two cases with equal sort
      criteria will be in the same relative order before and after the
      sort.
    * T-TEST (re-written).
    * DATE and USE.  These commands are parsed but otherwise ignored,
      to enhance compatibility with certain command files that invoke
      them unnecessarily.
    * VARIABLE WIDTH, VARIABLE ALIGNMENT, and VARIABLE LEVEL.  These
      currently have no effect on PSPP output, but their values are
      written to and read from system files and thus may affect
      third-party software.
    * SET EPOCH implemented.
    * DATA LIST FREE and DATA LIST LIST now support arbitrary field
      delimiters.
    * FILE HANDLE now supports custom tab widths.

  Long variable names (and other identifiers) are now supported.  Up
  to the first 64 bytes of each identifier is significant.  PSPP now
  reads and writes system files compatible with SPSS version 12.

  New --algorithm and --syntax command line options allow
  SPSS-compatible or enhanced modes to be selected.

  Support for transformation expressions has been rewritten and
  significantly improved.  Refer to the manual for details.

  Calculation of moments (mean, standard deviation, kurtosis,
  skewness) has been rewritten and should now be more accurate.  In
  --algorithm=enhanced mode moments may be more accurate than SPSS in
  some cases.

  Numerous bugs have been fixed, too many to mention here.  Many new
  tests have been added, leading to the discovery and fixing of many
  of these bugs.

  The ASCII output driver can now squeeze multiple blank lines into
  single blank lines.

  Much of the code has been rewritten and refactored.  It is now much
  cleaner.

  The FILE TYPE and REPEATING DATA commands have been disabled for
  this release because their implementations were deemed too buggy to
  be useful.  They will be fixed and replaced in a future release.

  New pspp-mode for Emacs (in pspp-mode.el).

  Added rudimentary command-line completion for interactive input.

  lib/julcal and lib/dcdflib are no longer used, so they have been
  removed.

21 files changed, 146 insertions, 820 deletions

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 6c96e8a9b16..74117ded002 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,33 +1,39 @@
-# $NetBSD: Makefile,v 1.40 2009/04/30 20:50:43 zafer Exp $
+# $NetBSD: Makefile,v 1.41 2009/09/04 21:39:10 asau Exp $
 #
 
-DISTNAME=	pspp-0.3.0
-PKGREVISION=	5
+DISTNAME=	pspp-0.6.1
 CATEGORIES=	math
-MASTER_SITES=	ftp://alpha.gnu.org/gnu/pspp/ \
-		ftp://ftp.unex.es/pub/gnu-beta/pspp/ \
-		ftp://ftp.kddlabs.co.jp/gnusoftware/alpha-gnu/pspp/ \
-		ftp://ftp.icm.edu.pl/vol/rzm1/gnu-alpha/pspp/ 
+MASTER_SITES=	${MASTER_SITE_GNU:=pspp/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/pspp/
 COMMENT=	Program for statistical analysis of sampled data
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
-CPPFLAGS+=		-Dunix=1
+USE_LIBTOOL=		yes
+USE_TOOLS+=		perl pkg-config msgfmt
+USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
+.include "options.mk"
+
 PKG_SYSCONFSUBDIR=	pspp
 EGDIR=		${PREFIX}/share/examples/pspp
 CONF_FILES=	${EGDIR}/devices ${PKG_SYSCONFDIR}/devices
-CONF_FILES+=	${EGDIR}/html-prologue ${PKG_SYSCONFDIR}/html-prologue
-CONF_FILES+=	${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
-CONF_FILES+=	${EGDIR}/ps-prologue ${PKG_SYSCONFDIR}/ps-prologue
 INFO_FILES=	# PLIST
 
+TEST_TARGET=	check
+
+USE_NCURSES=	yes
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/PLIST b/math/pspp/PLIST
index eb31d283b8a..fbe82db8d4c 100644
--- a/math/pspp/PLIST
+++ b/math/pspp/PLIST
@@ -1,10 +1,53 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:05:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/09/04 21:39:10 asau Exp $
 bin/pspp
-info/pspp.info
-share/doc/pspp/NEWS
-share/doc/pspp/README
-share/doc/pspp/TODO
+${PLIST.x11}bin/psppire
+info/pspp-dev.info
+info/pspp.info.gz
+lib/charset.alias
+${PLIST.x11}lib/pspp/libpsppire.la
+${PLIST.x11}lib/pspp/libpsppwidgets.la
 share/examples/pspp/devices
-share/examples/pspp/html-prologue
-share/examples/pspp/papersize
-share/examples/pspp/ps-prologue
+share/locale/en_GB/LC_MESSAGES/pspp.mo
+${PLIST.x11}share/pspp/crosstabs.glade
+${PLIST.x11}share/pspp/data-editor.glade
+${PLIST.x11}share/pspp/date-scale.png
+${PLIST.x11}share/pspp/descriptives-dialog.glade
+${PLIST.x11}share/pspp/examine.glade
+${PLIST.x11}share/pspp/frequencies.glade
+${PLIST.x11}share/pspp/goto-variable.png
+${PLIST.x11}share/pspp/insert-case.png
+${PLIST.x11}share/pspp/insert-variable.png
+${PLIST.x11}share/pspp/message-dialog.glade
+${PLIST.x11}share/pspp/nominal.png
+${PLIST.x11}share/pspp/oneway.glade
+${PLIST.x11}share/pspp/ordinal.png
+${PLIST.x11}share/pspp/output-viewer.glade
+share/pspp/psfonts/Courier-Bold.afm
+share/pspp/psfonts/Courier-BoldOblique.afm
+share/pspp/psfonts/Courier-Oblique.afm
+share/pspp/psfonts/Courier.afm
+share/pspp/psfonts/Helvetica-Bold.afm
+share/pspp/psfonts/Helvetica-BoldOblique.afm
+share/pspp/psfonts/Helvetica-Oblique.afm
+share/pspp/psfonts/Helvetica.afm
+share/pspp/psfonts/Times-Bold.afm
+share/pspp/psfonts/Times-BoldItalic.afm
+share/pspp/psfonts/Times-Italic.afm
+share/pspp/psfonts/Times-Roman.afm
+${PLIST.x11}share/pspp/psppicon.png
+${PLIST.x11}share/pspp/psppire.glade
+${PLIST.x11}share/pspp/pspplogo.png
+${PLIST.x11}share/pspp/rank.glade
+${PLIST.x11}share/pspp/recent-dialogs.png
+${PLIST.x11}share/pspp/recode.glade
+${PLIST.x11}share/pspp/regression.glade
+${PLIST.x11}share/pspp/scale.png
+${PLIST.x11}share/pspp/select-cases.png
+${PLIST.x11}share/pspp/splash.png
+${PLIST.x11}share/pspp/split-file.png
+${PLIST.x11}share/pspp/string.png
+${PLIST.x11}share/pspp/syntax-editor.glade
+${PLIST.x11}share/pspp/t-test.glade
+${PLIST.x11}share/pspp/text-data-import.glade
+${PLIST.x11}share/pspp/value-labels.png
+${PLIST.x11}share/pspp/weight-cases.png
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index 0764c87f746..89388b2bc8a 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,22 +1,7 @@
-$NetBSD: distinfo,v 1.12 2008/06/12 02:14:36 joerg Exp $
+$NetBSD: distinfo,v 1.13 2009/09/04 21:39:10 asau Exp $
 
-SHA1 (pspp-0.3.0.tar.gz) = 1d07a7e7ef0677e5934331ed0b80b92c7bba7074
-RMD160 (pspp-0.3.0.tar.gz) = 8272d458340e77ffa54962c12a9fe377498fb10a
-Size (pspp-0.3.0.tar.gz) = 1122999 bytes
-SHA1 (patch-aa) = 7d332aa82e51da9192cefd6a450d20e2d7c493c8
-SHA1 (patch-ab) = b6e70c52e780cd58fc8bed770b22642e0d67d820
-SHA1 (patch-ac) = 9b7c87e6729616b3c21d683764719c894480624a
-SHA1 (patch-ad) = 64e9141e75096761f8ee3f8fbce1903aa32f9866
-SHA1 (patch-ae) = 9f3f6cbe2817ab5282e70559e245cf7df0016ba3
-SHA1 (patch-ag) = 3a565a2becf76af67e1cf6b443ed51e24b4fd0f0
-SHA1 (patch-ah) = 8fd5821c09fcc5ea4f96a198186c99e0d958842d
-SHA1 (patch-ai) = f6886d4cd3779f71353dc0e013f3b37b86fe7474
-SHA1 (patch-aj) = e34a0638b8226efdf33cee4eccd40fc4dcaf6210
-SHA1 (patch-ak) = db897ff986bd8747be46e96a4ed5cd8fc4e46c2a
-SHA1 (patch-al) = b998fc5f7f6c11bc4b862c0c25fd6a810c60ec97
-SHA1 (patch-am) = 0a9cf92a8b15faa73002d7000a4fa8f6e86e1973
-SHA1 (patch-an) = 1bcb30f7a0a21a9a05cf022d18c9cf806c204f85
-SHA1 (patch-ao) = c918fe9d3837ea5902405a0faca885528b31a6f6
-SHA1 (patch-ap) = 1682fe56215616b09782ca1f1f5d5f59834b043b
-SHA1 (patch-aq) = dc3fc8b4b642b79b854bae03a3622dc561d0605c
-SHA1 (patch-ar) = 863562c8f7ad6b7666fb58ca73672b559a77973a
+SHA1 (pspp-0.6.1.tar.gz) = 22f335053a3e1d3861bfc2d87536b9a6fc5a1ae7
+RMD160 (pspp-0.6.1.tar.gz) = 930fc58b77ff50819cd7449147dab5906e872850
+Size (pspp-0.6.1.tar.gz) = 3217033 bytes
+SHA1 (patch-aa) = c7024562eee77aa558931cab387d250e046f11e4
+SHA1 (patch-ad) = 34446abc6b187300e22a1fe764ea55df7c3dd43a
diff --git a/math/pspp/options.mk b/math/pspp/options.mk
new file mode 100644
index 00000000000..955afb07255
--- /dev/null
+++ b/math/pspp/options.mk
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.1 2009/09/04 21:39:10 asau Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.pspp
+PKG_SUPPORTED_OPTIONS=		pgsql x11
+PKG_SUGGESTED_OPTIONS=		x11
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=		yes
+
+#CONFIGURE_ARGS+=	--without-libplot # :(
+.include "../../graphics/plotutils/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-gui --without-libplot
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=	--with-libpq
+.include "../../databases/postgresql84-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-libpq
+.endif
diff --git a/math/pspp/patches/patch-aa b/math/pspp/patches/patch-aa
index 5681b9a9350..20cfc159785 100644
--- a/math/pspp/patches/patch-aa
+++ b/math/pspp/patches/patch-aa
@@ -1,31 +1,38 @@
-$NetBSD: patch-aa,v 1.2 1999/07/13 01:31:08 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/04 21:39:10 asau Exp $
 
---- Makefile.in.orig	Tue Mar  9 14:02:32 1999
-+++ Makefile.in	Thu Jul  8 15:06:23 1999
-@@ -97,7 +97,7 @@
+--- Makefile.in.orig	2008-10-10 08:12:11.000000000 +0400
++++ Makefile.in	2009-09-04 13:59:51.000000000 +0400
+@@ -1618,7 +1618,7 @@
+ dist_pkgsysconf_DATA = \
+ 	config/devices
  
- SUBDIRS = doc intl po lib src config tests
+-psfontsdir = $(pkgsysconfdir)/psfonts
++psfontsdir = $(datadir)/pspp/psfonts
+ dist_psfonts_DATA = \
+ 	config/psfonts/Helvetica-Bold.afm \
+ 	config/psfonts/Times-Bold.afm \
+@@ -2533,7 +2533,7 @@
+ $(top_srcdir)/configure:  $(am__configure_deps)
+ 	cd $(srcdir) && $(AUTOCONF)
+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++#	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
--pkgdocdir = $(prefix)/doc/@PACKAGE@
-+pkgdocdir = $(prefix)/share/doc/@PACKAGE@
- pkgdoc_DATA = NEWS README TODO
- noinst_DATA = AUTHORS THANKS
+ config.h: stamp-h1
+ 	@if test ! -f $@; then \
+@@ -7140,12 +7140,12 @@
+ 	done
+ install-dist_pkgsysconfDATA: $(dist_pkgsysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
++	test -z "$(datarootdir)/examples/pspp" || $(MKDIR_P) "$(DESTDIR)$(datarootdir)/examples/pspp"
+ 	@list='$(dist_pkgsysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(dist_pkgsysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgsysconfdir)/$$f'"; \
+-	  $(dist_pkgsysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgsysconfdir)/$$f"; \
++	  echo " $(dist_pkgsysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datarootdir)/examples/pspp/$$f'"; \
++	  $(dist_pkgsysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datarootdir)/examples/pspp/$$f"; \
+ 	done
  
-@@ -132,7 +132,7 @@
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- $(ACLOCAL_M4):  configure.in  acinclude.m4
--	cd $(srcdir) && $(ACLOCAL)
-+#	cd $(srcdir) && $(ACLOCAL)
- 
- config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
-@@ -155,7 +155,7 @@
- 		$(MAKE) $(srcdir)/stamp-h.in; \
- 	else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
--	cd $(top_srcdir) && $(AUTOHEADER)
-+#	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
- 
- mostlyclean-hdr:
+ uninstall-dist_pkgsysconfDATA:
diff --git a/math/pspp/patches/patch-ab b/math/pspp/patches/patch-ab
deleted file mode 100644
index b66348d8f6f..00000000000
--- a/math/pspp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/04/23 12:42:24 mycroft Exp $
-
---- Makefile.am.orig	Thu Nov 19 12:14:02 1998
-+++ Makefile.am	Fri Apr 23 08:15:22 1999
-@@ -4,7 +4,7 @@
- 
- SUBDIRS = doc intl po lib src config tests
- 
--pkgdocdir = $(prefix)/doc/@PACKAGE@
-+pkgdocdir = $(prefix)/share/doc/@PACKAGE@
- pkgdoc_DATA = NEWS README TODO
- noinst_DATA = AUTHORS THANKS
- 
diff --git a/math/pspp/patches/patch-ac b/math/pspp/patches/patch-ac
deleted file mode 100644
index b85a5b7d47f..00000000000
--- a/math/pspp/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/07/13 01:31:08 jlam Exp $
-
---- config.h.in.orig	Tue Mar  9 14:02:30 1999
-+++ config.h.in	Thu Jul  8 14:41:55 1999
-@@ -274,9 +274,15 @@
- /* Define if you have the <nl_types.h> header file.  */
- #undef HAVE_NL_TYPES_H
- 
-+/* Define if you have the <history.h> header file.  */
-+#undef HAVE_HISTORY_H
-+
- /* Define if you have the <readline/history.h> header file.  */
- #undef HAVE_READLINE_HISTORY_H
- 
-+/* Define if you have the <readline.h> header file.  */
-+#undef HAVE_READLINE_H
-+
- /* Define if you have the <readline/readline.h> header file.  */
- #undef HAVE_READLINE_READLINE_H
- 
-@@ -312,6 +318,9 @@
- 
- /* Define if you have the readline library (-lreadline).  */
- #undef HAVE_LIBREADLINE
-+
-+/* Define if you have the tilde_expand function.  */
-+#undef HAVE_TILDE_EXPAND
- 
- /* Name of package */
- #undef PACKAGE
diff --git a/math/pspp/patches/patch-ad b/math/pspp/patches/patch-ad
index a365d28dec6..30fde313886 100644
--- a/math/pspp/patches/patch-ad
+++ b/math/pspp/patches/patch-ad
@@ -1,55 +1,14 @@
-$NetBSD: patch-ad,v 1.4 2004/03/08 21:13:55 seb Exp $
+$NetBSD: patch-ad,v 1.5 2009/09/04 21:39:10 asau Exp $
 
---- configure.in.orig	2000-01-02 04:05:50.000000000 +0000
-+++ configure.in
-@@ -41,28 +41,30 @@ fi
- AC_SUBST(LOCAL_CC)
- 
- AC_CHECK_LIB(m, sin)
--AC_CHECK_LIB(gmp, mpf_get_str, 
--  LIBS="-lgmp $LIBS" GMP_SUBDIRS= GMP_LIBS=,
--  GMP_SUBDIRS=gmp GMP_LIBS='$(GMP_LIBS)')
-+LIBS="-lgmp $LIBS";GMP_SUBDIRS=;GMP_LIBS=
- AC_SUBST(GMP_SUBDIRS)
- AC_SUBST(GMP_LIBS)
- 
--AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
--  AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
--               termcap=no))
-+AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
-+             termcap=no)
- if test "$termcap" = yes; then
-   AC_CHECK_HEADERS(termcap.h)
-   AC_DEFINE(HAVE_LIBTERMCAP)
+--- configure.orig	2009-09-04 12:34:45.000000000 +0400
++++ configure	2009-09-04 12:38:46.000000000 +0400
+@@ -21763,8 +21763,7 @@
+ { echo "$as_me:$LINENO: result: $pspp_cv_build_exeext" >&5
+ echo "${ECHO_T}$pspp_cv_build_exeext" >&6; }
+   EXEEXT_FOR_BUILD=""
+-  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex
+-t}
++  test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext}
  fi
  
--AC_CHECK_LIB(readline, readline)
--if test "$ac_cv_lib_readline_readline" = yes; then
--  AC_CHECK_HEADERS(readline/readline.h)
--  AC_CHECK_LIB(readline, add_history, history=yes,
-+AC_CHECK_LIB(edit, readline, readlinelib=edit have_readline=yes,
-+  AC_CHECK_LIB(readline, readline, readlinelib=readline have_readline=yes,
-+    readline=no))
-+if test "$have_readline" = yes; then
-+  LIBS="-l$readlinelib $LIBS"
-+  AC_CHECK_HEADERS(readline.h readline/readline.h)
-+  AC_DEFINE(HAVE_LIBREADLINE)
-+  AC_CHECK_LIB($readlinelib, tilde_expand, AC_DEFINE(HAVE_TILDE_EXPAND))
-+  AC_CHECK_LIB($readlinelib, add_history, history=yes,
-     AC_CHECK_LIB(history, add_history, LIBS="-lhistory" history=yes,
-                  history=no))
-   if test "$history" = yes; then
--    AC_CHECK_HEADERS(readline/history.h)
-+    AC_CHECK_HEADERS(history.h readline/history.h)
-     AC_DEFINE(HAVE_LIBHISTORY)
-   fi
- fi
-@@ -201,7 +203,7 @@ AC_PROG_LN_S
  
- dnl This must be after other tests so warnings don't provoke errors above.
- if test "$ac_cv_prog_gcc" = yes; then
--	CFLAGS="-g -Wall -W -Wno-uninitialized -Wwrite-strings \
-+	CFLAGS="$CFLAGS -g -Wall -W -Wno-uninitialized -Wwrite-strings \
- -Wstrict-prototypes -Wpointer-arith"
- 	if test "$CC_OPTIONS" != ""; then
- 		CFLAGS="$CFLAGS $CC_OPTIONS"
diff --git a/math/pspp/patches/patch-ae b/math/pspp/patches/patch-ae
deleted file mode 100644
index 4e8a57191a3..00000000000
--- a/math/pspp/patches/patch-ae
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/01/14 14:01:59 rh Exp $
-
---- /dev/null	Fri Jan 14 13:54:07 2000
-+++ src/getopt.h	Fri Jan 14 13:53:30 2000
-@@ -0,0 +1,129 @@
-+/* Declarations for getopt.
-+   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by the
-+   Free Software Foundation; either version 2, or (at your option) any
-+   later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-+
-+#ifndef _GETOPT_H
-+#define _GETOPT_H 1
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+/* For communication from `getopt' to the caller.
-+   When `getopt' finds an option that takes an argument,
-+   the argument value is returned here.
-+   Also, when `ordering' is RETURN_IN_ORDER,
-+   each non-option ARGV-element is returned here.  */
-+
-+extern char *optarg;
-+
-+/* Index in ARGV of the next element to be scanned.
-+   This is used for communication to and from the caller
-+   and for communication between successive calls to `getopt'.
-+
-+   On entry to `getopt', zero means this is the first call; initialize.
-+
-+   When `getopt' returns EOF, this is the index of the first of the
-+   non-option elements that the caller should itself scan.
-+
-+   Otherwise, `optind' communicates from one call to the next
-+   how much of ARGV has been scanned so far.  */
-+
-+extern int optind;
-+
-+/* Callers store zero here to inhibit the error message `getopt' prints
-+   for unrecognized options.  */
-+
-+extern int opterr;
-+
-+/* Set to an option character which was unrecognized.  */
-+
-+extern int optopt;
-+
-+/* Describe the long-named options requested by the application.
-+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-+   of `struct option' terminated by an element containing a name which is
-+   zero.
-+
-+   The field `has_arg' is:
-+   no_argument		(or 0) if the option does not take an argument,
-+   required_argument	(or 1) if the option requires an argument,
-+   optional_argument 	(or 2) if the option takes an optional argument.
-+
-+   If the field `flag' is not NULL, it points to a variable that is set
-+   to the value given in the field `val' when the option is found, but
-+   left unchanged if the option is not found.
-+
-+   To have a long-named option do something other than set an `int' to
-+   a compiled-in constant, such as set a value from `optarg', set the
-+   option's `flag' field to zero and its `val' field to a nonzero
-+   value (the equivalent single-letter option character, if there is
-+   one).  For long options that have a zero `flag' field, `getopt'
-+   returns the contents of the `val' field.  */
-+
-+struct option
-+{
-+#if	__STDC__
-+  const char *name;
-+#else
-+  char *name;
-+#endif
-+  /* has_arg can't be an enum because some compilers complain about
-+     type mismatches in all the code that assumes it is an int.  */
-+  int has_arg;
-+  int *flag;
-+  int val;
-+};
-+
-+/* Names for the values of the `has_arg' field of `struct option'.  */
-+
-+#define	no_argument		0
-+#define required_argument	1
-+#define optional_argument	2
-+
-+#if __STDC__
-+#if defined(__GNU_LIBRARY__)
-+/* Many other libraries have conflicting prototypes for getopt, with
-+   differences in the consts, in stdlib.h.  To avoid compilation
-+   errors, only prototype getopt for the GNU C library.  */
-+extern int getopt (int argc, char *const *argv, const char *shortopts);
-+#else /* not __GNU_LIBRARY__ */
-+extern int getopt ();
-+#endif /* not __GNU_LIBRARY__ */
-+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-+		        const struct option *longopts, int *longind);
-+extern int getopt_long_only (int argc, char *const *argv,
-+			     const char *shortopts,
-+		             const struct option *longopts, int *longind);
-+
-+/* Internal only.  Users should not call this directly.  */
-+extern int _getopt_internal (int argc, char *const *argv,
-+			     const char *shortopts,
-+		             const struct option *longopts, int *longind,
-+			     int long_only);
-+#else /* not __STDC__ */
-+extern int getopt ();
-+extern int getopt_long ();
-+extern int getopt_long_only ();
-+
-+extern int _getopt_internal ();
-+#endif /* not __STDC__ */
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+
-+#endif /* _GETOPT_H */
diff --git a/math/pspp/patches/patch-ag b/math/pspp/patches/patch-ag
deleted file mode 100644
index 83511ed031e..00000000000
--- a/math/pspp/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2000/01/14 14:01:59 rh Exp $
-
---- lib/misc/getdelim.c.orig	Fri Mar 12 18:21:55 1999
-+++ lib/misc/getdelim.c	Fri Jan 14 13:57:39 2000
-@@ -21,7 +21,6 @@
- #include <assert.h>
- #include <stddef.h>
- #include <stdio.h>
--#include "common.h"
- 
- /* Reads a DELIMITER-separated field of any length from file STREAM.
-    *LINEPTR is a malloc'd string of size N; if *LINEPTR is NULL, it is
diff --git a/math/pspp/patches/patch-ah b/math/pspp/patches/patch-ah
deleted file mode 100644
index a67b387f5e9..00000000000
--- a/math/pspp/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2000/01/14 14:01:59 rh Exp $
-
---- src/getline.c.orig	Fri Jan 14 13:41:51 2000
-+++ src/getline.c	Fri Jan 14 13:44:14 2000
-@@ -47,6 +47,8 @@
- 
- #if HAVE_READLINE_HISTORY_H
- #include <readline/history.h>
-+#elif HAVE_HISTORY_H
-+#include <history.h>
- #else /* no readline/history.h */
- extern void add_history (char *);
- extern void using_history (void);
-@@ -407,6 +409,8 @@
- 
- #if HAVE_READLINE_READLINE_H
- #include <readline/readline.h>
-+#elif HAVE_READLINE_H
-+#include <readline.h>
- #else /* no readline/readline.h */
- extern char *readline (char *);
- #endif /* no readline/readline.h */
diff --git a/math/pspp/patches/patch-ai b/math/pspp/patches/patch-ai
deleted file mode 100644
index bd73ffc0b4b..00000000000
--- a/math/pspp/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2002/03/07 06:46:35 jmc Exp $
-
---- src/groff-font.c.orig	Thu Mar  7 06:43:18 2002
-+++ src/groff-font.c	Thu Mar  7 06:43:43 2002
-@@ -397,7 +397,7 @@
-   va_list args;
- 
-   va_start (args, format);
--  tmsg (class, format, args, _("installation error: Groff font error: "));
-+  tmsg (class, format, _("installation error: Groff font error: "), args);
-   va_end (args);
- 
-   return 0;
diff --git a/math/pspp/patches/patch-aj b/math/pspp/patches/patch-aj
deleted file mode 100644
index 3b173638674..00000000000
--- a/math/pspp/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/06/28 08:00:29 agc Exp $
-
---- src/glob.c	2002/06/28 07:57:05	1.1
-+++ src/glob.c	2002/06/28 07:57:47
-@@ -44,6 +44,7 @@
- 
- #if HAVE_LIBHISTORY
- #if HAVE_READLINE_HISTORY_H
-+#include <stdio.h>
- #include <readline/history.h>
- #else /* no readline/history.h */
- extern void using_history ();
diff --git a/math/pspp/patches/patch-ak b/math/pspp/patches/patch-ak
deleted file mode 100644
index cd926a3dc95..00000000000
--- a/math/pspp/patches/patch-ak
+++ /dev/null
@@ -1,364 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2004/03/08 21:13:55 seb Exp $
-
---- configure.orig	2000-01-08 01:36:11.000000000 +0000
-+++ configure
-@@ -1744,7 +1744,7 @@ else
- int main() {
- 
- /* Ultrix mips cc rejects this.  */
--typedef int charset[2]; const charset x = {0,0};
-+typedef int charset[2]; const charset x;
- /* SunOS 4.1.1 cc rejects this.  */
- char const *const *ccp;
- char **p;
-@@ -3567,16 +3567,20 @@ else
-   echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for mpf_get_str in -lgmp""... $ac_c" 1>&6
--echo "configure:3572: checking for mpf_get_str in -lgmp" >&5
--ac_lib_var=`echo gmp'_'mpf_get_str | sed 'y%./+-%__p_%'`
-+LIBS="-lgmp $LIBS";GMP_SUBDIRS=;GMP_LIBS=
-+
-+
-+
-+echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-+echo "configure:3576: checking for tgetent in -ltermcap" >&5
-+ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgmp  $LIBS"
-+LIBS="-ltermcap  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3580 "configure"
-+#line 3584 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3581,13 +3585,13 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char mpf_get_str();
-+char tgetent();
- 
- int main() {
--mpf_get_str()
-+tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:3591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3602,25 +3606,69 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LIBS="-lgmp $LIBS" GMP_SUBDIRS= GMP_LIBS=
-+  LIBS="-ltermcap $LIBS" termcap=yes
- else
-   echo "$ac_t""no" 1>&6
--GMP_SUBDIRS=gmp GMP_LIBS='$(GMP_LIBS)'
-+termcap=no
- fi
- 
-+if test "$termcap" = yes; then
-+  for ac_hdr in termcap.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:3621: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3626 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:3631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
- 
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_LIBTERMCAP 1
-+EOF
- 
-+fi
- 
--echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:3616: checking for tgetent in -lncurses" >&5
--ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
-+echo "configure:3664: checking for readline in -ledit" >&5
-+ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lncurses  $LIBS"
-+LIBS="-ledit  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3624 "configure"
-+#line 3672 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3625,13 +3673,13 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char tgetent();
-+char readline();
- 
- int main() {
--tgetent()
-+readline()
- ; return 0; }
- EOF
--if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3646,19 +3694,19 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LIBS="-lncurses $LIBS" termcap=yes
-+  readlinelib=edit have_readline=yes
- else
-   echo "$ac_t""no" 1>&6
--echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:3654: checking for tgetent in -ltermcap" >&5
--ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-+echo "configure:3702: checking for readline in -lreadline" >&5
-+ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ltermcap  $LIBS"
-+LIBS="-lreadline  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3662 "configure"
-+#line 3710 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3663,13 +3711,13 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char tgetent();
-+char readline();
- 
- int main() {
--tgetent()
-+readline()
- ; return 0; }
- EOF
--if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3684,16 +3732,17 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  LIBS="-ltermcap $LIBS" termcap=yes
-+  readlinelib=readline have_readline=yes
- else
-   echo "$ac_t""no" 1>&6
--termcap=no
-+readline=no
- fi
- 
- fi
- 
--if test "$termcap" = yes; then
--  for ac_hdr in termcap.h
-+if test "$have_readline" = yes; then
-+  LIBS="-l$readlinelib $LIBS"
-+  for ac_hdr in readline.h readline/readline.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3734,21 +3783,19 @@ fi
- done
- 
-   cat >> confdefs.h <<\EOF
--#define HAVE_LIBTERMCAP 1
-+#define HAVE_LIBREADLINE 1
- EOF
- 
--fi
--
--echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
--echo "configure:3744: checking for readline in -lreadline" >&5
--ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
-+  echo $ac_n "checking for tilde_expand in -l$readlinelib""... $ac_c" 1>&6
-+echo "configure:3791: checking for tilde_expand in -l$readlinelib" >&5
-+ac_lib_var=`echo $readlinelib'_'tilde_expand | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lreadline  $LIBS"
-+LIBS="-l$readlinelib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3752 "configure"
-+#line 3799 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3753,13 +3800,13 @@ cat > conftest.$ac_ext <<EOF
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char readline();
-+char tilde_expand();
- 
- int main() {
--readline()
-+tilde_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3774,69 +3821,24 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
-+  cat >> confdefs.h <<\EOF
-+#define HAVE_TILDE_EXPAND 1
- EOF
- 
--  LIBS="-lreadline $LIBS"
--
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
--if test "$ac_cv_lib_readline_readline" = yes; then
--  for ac_hdr in readline/readline.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3795: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 3800 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
--fi
--done
--
--  echo $ac_n "checking for add_history in -lreadline""... $ac_c" 1>&6
--echo "configure:3832: checking for add_history in -lreadline" >&5
--ac_lib_var=`echo readline'_'add_history | sed 'y%./+-%__p_%'`
-+  echo $ac_n "checking for add_history in -l$readlinelib""... $ac_c" 1>&6
-+echo "configure:3834: checking for add_history in -l$readlinelib" >&5
-+ac_lib_var=`echo $readlinelib'_'add_history | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lreadline  $LIBS"
-+LIBS="-l$readlinelib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3840 "configure"
-+#line 3842 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3909,7 +3911,7 @@ fi
- fi
- 
-   if test "$history" = yes; then
--    for ac_hdr in readline/history.h
-+    for ac_hdr in history.h readline/history.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -4367,7 +4369,7 @@ else
- int main() {
- 
- /* Ultrix mips cc rejects this.  */
--typedef int charset[2]; const charset x = {0,0};
-+typedef int charset[2]; const charset x;
- /* SunOS 4.1.1 cc rejects this.  */
- char const *const *ccp;
- char **p;
-@@ -5573,7 +5575,7 @@ fi
- 
- 
- if test "$ac_cv_prog_gcc" = yes; then
--	CFLAGS="-g -Wall -W -Wno-uninitialized -Wwrite-strings \
-+	CFLAGS="$CFLAGS -g -Wall -W -Wno-uninitialized -Wwrite-strings \
- -Wstrict-prototypes -Wpointer-arith"
- 	if test "$CC_OPTIONS" != ""; then
- 		CFLAGS="$CFLAGS $CC_OPTIONS"
diff --git a/math/pspp/patches/patch-al b/math/pspp/patches/patch-al
deleted file mode 100644
index 08434ac7484..00000000000
--- a/math/pspp/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/12/24 17:50:24 jmmv Exp $
-
---- config/Makefile.in.orig	Sat Jan  8 03:04:18 2000
-+++ config/Makefile.in
-@@ -95,7 +95,7 @@ USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- l = @l@
- 
--pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
-+pkgsysconfdir = $(datadir)/examples/@PACKAGE@
- pkgsysconf_DATA = devices html-prologue papersize ps-prologue
- EXTRA_DIST = devices html-prologue papersize ps-prologue
- 
diff --git a/math/pspp/patches/patch-am b/math/pspp/patches/patch-am
deleted file mode 100644
index b61c3e637c9..00000000000
--- a/math/pspp/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/12/24 17:50:24 jmmv Exp $
-
---- src/Makefile.in.orig	Sat Jan  8 03:04:16 2000
-+++ src/Makefile.in
-@@ -564,7 +564,7 @@ version.c:
- 	echo "const char host_system[] = \"$(host_triplet)\";" >> version.c
- 	echo "const char build_system[] = \"$(build_triplet)\";" >> version.c
- 	echo "const char default_config_path[] =\
--\"~/.pspp:$(pkgsysconfdir)\";" >> version.c
-+\"~/.pspp:$(sysconfdir)\";" >> version.c
- 	echo "const char include_path[] =\
- \"./:~/.pspp/include:$(pkgdatadir)\";" >> version.c
- 	echo "const char groff_font_path[] = \"~/.pspp/font:\" \\" >> version.c
diff --git a/math/pspp/patches/patch-an b/math/pspp/patches/patch-an
deleted file mode 100644
index 7e500d36d29..00000000000
--- a/math/pspp/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2003/07/29 13:21:57 jmmv Exp $
-
---- src/output.h.orig	2000-01-03 04:32:06.000000000 +0100
-+++ src/output.h
-@@ -28,6 +28,7 @@ struct rect
-     int x1, y1;			/* Upper left. */
-     int x2, y2;			/* Lower right, not part of the rectangle. */
-   };
-+typedef struct rect rect;
- 
- #if __GNUC__ > 1 && defined(__OPTIMIZE__)
- extern inline int width (rect r) __attribute__ ((const));
diff --git a/math/pspp/patches/patch-ao b/math/pspp/patches/patch-ao
deleted file mode 100644
index 08fc7701540..00000000000
--- a/math/pspp/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/03/08 21:13:55 seb Exp $
-
---- src/pfm-write.c.orig	2000-01-03 03:32:06.000000000 +0000
-+++ src/pfm-write.c
-@@ -30,7 +30,7 @@
- #include "avl.h"
- #include "error.h"
- #include "file-handle.h"
--#include "gmp/gmp.h"
-+#include <gmp.h>
- #include "magic.h"
- #include "pfm.h"
- #include "str.h"
diff --git a/math/pspp/patches/patch-ap b/math/pspp/patches/patch-ap
deleted file mode 100644
index 92e4aea9b55..00000000000
--- a/math/pspp/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/12/20 15:13:32 joerg Exp $
-
---- src/q2c.c.orig	2005-12-20 15:03:41.000000000 +0000
-+++ src/q2c.c
-@@ -1136,6 +1136,7 @@ dump_declarations (void)
- 
- 	  default:
- 	    /* nothing */
-+	    break;
- 	  }
-       }
- 
diff --git a/math/pspp/patches/patch-aq b/math/pspp/patches/patch-aq
deleted file mode 100644
index 821150e6065..00000000000
--- a/math/pspp/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/07/09 13:43:56 joerg Exp $
-
---- tests/Makefile.in.orig	2006-07-09 15:40:15.000000000 +0200
-+++ tests/Makefile.in
-@@ -99,7 +99,7 @@ TESTS = syntax
- 
- noinst_PROGRAMS = gengarbage
- 
--noinst_DATA = sort.data
-+noinst_DATA = 
- 
- EXTRA_DIST = aggregate.stat autorecod.stat beg-data.stat bignum.data	bignum.stat compute.stat count.stat crosstabs.stat data-fmts.stat	data-list.data data-list.stat descript.stat do-if.stat do-repeat.stat	expr.stat file-lab.stat filter.stat flip.stat gengarbage.c		inpt-pgm.stat lag.stat list.data list.stat loop.stat mtch-file.stat	means.stat mdfy-vars.stat print.stat pcs-if.stat recode.stat		repeating.stat reread.data reread.stat sample.stat sort.stat		splt-file.stat sys-info.stat t-test.stat tabs.stat temporary.stat	time-date.stat vector.stat weighting.data weighting.stat syntax
- 
diff --git a/math/pspp/patches/patch-ar b/math/pspp/patches/patch-ar
deleted file mode 100644
index c783dbf5ac3..00000000000
--- a/math/pspp/patches/patch-ar
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2008/06/12 02:14:36 joerg Exp $
-
---- po/Makefile.in.in.orig	2008-06-11 10:30:55.000000000 +0000
-+++ po/Makefile.in.in
-@@ -110,16 +110,16 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- 	if test -r $(MKINSTALLDIRS); then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
- 	else \
--	  $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  case "$$cat" in \
--	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
-+	    *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \
-+	    *)     destdir=${DESTDIR}$(localedir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \