summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authormycroft <mycroft@pkgsrc.org>2000-04-16 08:56:15 +0000
committermycroft <mycroft@pkgsrc.org>2000-04-16 08:56:15 +0000
commit5bdf0bd0de2ea96c83421baea7091034d5bd849b (patch)
tree0ff729dcf1819859f3c63b61acd9d37d1cb4a6d8 /math
parent91371c8738cef1e1ce477665d362bd838562105e (diff)
downloadpkgsrc-5bdf0bd0de2ea96c83421baea7091034d5bd849b.tar.gz
This pkg wants termcap, not curses.
Also, make sure to run autoconf so that configure really does look for libedit.
Diffstat (limited to 'math')
-rw-r--r--math/pspp/Makefile13
-rw-r--r--math/pspp/files/patch-sum4
-rw-r--r--math/pspp/patches/patch-ad18
3 files changed, 22 insertions, 13 deletions
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index bbf93d24f49..44cb8612f9a 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/01/15 18:46:29 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2000/04/16 08:56:15 mycroft Exp $
#
DISTNAME= pspp-0.3.0
@@ -15,17 +15,16 @@ MASTER_SITES= ftp://franz.stat.wisc.edu/pub/PSPP/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/pspp/
+BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:../../devel/autoconf
DEPENDS+= gettext-0.10.*:../../devel/gettext
-DEPENDS+= ncurses>=4.2:../../devel/ncurses
-
-.if !exists(/usr/include/readline.h)
-DEPENDS+= readline-4.0:../../devel/readline
-.endif
GNU_CONFIGURE= yes
USE_GTEXINFO= yes
-CPPFLAGS+= -Dunix=1 -I${LOCALBASE}/include
+CPPFLAGS+= -Dunix=1
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
MAKE_ENV+= pkgsysconfdir="${PREFIX}/etc/pspp"
+pre-configure:
+ cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf
+
.include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/files/patch-sum b/math/pspp/files/patch-sum
index 2e499d37557..894564b0842 100644
--- a/math/pspp/files/patch-sum
+++ b/math/pspp/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2000/01/14 14:01:59 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/04/16 08:56:16 mycroft Exp $
MD5 (patch-aa) = 9968f7f4de23ea02b29876c7747c6674
MD5 (patch-ab) = 2161f75ea660dc822ca8932adefbd41c
MD5 (patch-ac) = 4b672f9e3362f831a189c081ecac77c0
-MD5 (patch-ad) = 2475cc1df4ae97f3ac75faa0ec03e4eb
+MD5 (patch-ad) = 689edea5b032b559c7c4e6cc8e59eb3e
MD5 (patch-ae) = 75a4520813c40b90ef0d85e44735296e
MD5 (patch-ag) = 8266026b8939be3182112ba0a752769b
MD5 (patch-ah) = 98219ca6052a8f123a5f6d8311f689c9
diff --git a/math/pspp/patches/patch-ad b/math/pspp/patches/patch-ad
index 382172e085f..314e07480b5 100644
--- a/math/pspp/patches/patch-ad
+++ b/math/pspp/patches/patch-ad
@@ -1,8 +1,18 @@
-$NetBSD: patch-ad,v 1.1 1999/07/13 01:31:09 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2000/04/16 08:56:16 mycroft Exp $
---- configure.in.orig Tue Mar 9 14:02:08 1999
-+++ configure.in Thu Jul 8 14:40:47 1999
-@@ -49,14 +49,19 @@
+--- configure.in.orig Sat Jan 1 23:05:50 2000
++++ configure.in Sun Apr 16 04:44:17 2000
+@@ -47,22 +47,26 @@
+ 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)
fi