pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/pspp Update to PSPP 0.6.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/533b047c1a03
branches: trunk
changeset: 398621:533b047c1a03
user: asau <asau%pkgsrc.org@localhost>
date: Fri Sep 04 21:39:10 2009 +0000
description:
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.
diffstat:
math/pspp/Makefile | 30 ++-
math/pspp/PLIST | 59 ++++++-
math/pspp/distinfo | 27 +--
math/pspp/options.mk | 27 +++
math/pspp/patches/patch-aa | 61 ++++---
math/pspp/patches/patch-ab | 13 -
math/pspp/patches/patch-ac | 30 ---
math/pspp/patches/patch-ad | 61 +------
math/pspp/patches/patch-ae | 134 ----------------
math/pspp/patches/patch-ag | 12 -
math/pspp/patches/patch-ah | 22 --
math/pspp/patches/patch-ai | 13 -
math/pspp/patches/patch-aj | 12 -
math/pspp/patches/patch-ak | 364 ---------------------------------------------
math/pspp/patches/patch-al | 13 -
math/pspp/patches/patch-am | 13 -
math/pspp/patches/patch-an | 12 -
math/pspp/patches/patch-ao | 13 -
math/pspp/patches/patch-ap | 12 -
math/pspp/patches/patch-aq | 13 -
math/pspp/patches/patch-ar | 25 ---
21 files changed, 146 insertions(+), 820 deletions(-)
diffs (truncated from 1082 to 300 lines):
diff -r 772efea0189b -r 533b047c1a03 math/pspp/Makefile
--- a/math/pspp/Makefile Fri Sep 04 21:27:23 2009 +0000
+++ b/math/pspp/Makefile Fri Sep 04 21:39:10 2009 +0000
@@ -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@localhost
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 -r 772efea0189b -r 533b047c1a03 math/pspp/PLIST
--- a/math/pspp/PLIST Fri Sep 04 21:27:23 2009 +0000
+++ b/math/pspp/PLIST Fri Sep 04 21:39:10 2009 +0000
@@ -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 -r 772efea0189b -r 533b047c1a03 math/pspp/distinfo
--- a/math/pspp/distinfo Fri Sep 04 21:27:23 2009 +0000
+++ b/math/pspp/distinfo Fri Sep 04 21:39:10 2009 +0000
@@ -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 -r 772efea0189b -r 533b047c1a03 math/pspp/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/math/pspp/options.mk Fri Sep 04 21:39:10 2009 +0000
@@ -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 -r 772efea0189b -r 533b047c1a03 math/pspp/patches/patch-aa
--- a/math/pspp/patches/patch-aa Fri Sep 04 21:27:23 2009 +0000
+++ b/math/pspp/patches/patch-aa Fri Sep 04 21:39:10 2009 +0000
@@ -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 @@
-
- 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
-
-@@ -132,7 +132,7 @@
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+--- 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
- $(ACLOCAL_M4): configure.in acinclude.m4
-- cd $(srcdir) && $(ACLOCAL)
-+# cd $(srcdir) && $(ACLOCAL)
+-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)
- 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
+ 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
- mostlyclean-hdr:
+ uninstall-dist_pkgsysconfDATA:
diff -r 772efea0189b -r 533b047c1a03 math/pspp/patches/patch-ab
--- a/math/pspp/patches/patch-ab Fri Sep 04 21:27:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 772efea0189b -r 533b047c1a03 math/pspp/patches/patch-ac
--- a/math/pspp/patches/patch-ac Fri Sep 04 21:27:23 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index