diff options
| -rw-r--r-- | math/pspp/Makefile | 6 | ||||
| -rw-r--r-- | math/pspp/distinfo | 3 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ak | 215 |
3 files changed, 218 insertions, 6 deletions
diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 913ecd84c80..8b79e4af92f 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:33 seb Exp $ +# $NetBSD: Makefile,v 1.20 2002/10/02 21:23:17 dillo Exp $ # DISTNAME= pspp-0.3.0 @@ -16,7 +16,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/pspp/ COMMENT= Program for statistical analysis of sampled data -BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes @@ -24,8 +23,5 @@ USE_LIBINTL= yes CPPFLAGS+= -Dunix=1 MAKE_ENV+= pkgsysconfdir="${PREFIX}/etc/pspp" -pre-configure: - cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf - .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pspp/distinfo b/math/pspp/distinfo index 58df2ef8263..2347329294f 100644 --- a/math/pspp/distinfo +++ b/math/pspp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/06/28 08:00:27 agc Exp $ +$NetBSD: distinfo,v 1.5 2002/10/02 21:23:18 dillo Exp $ SHA1 (pspp-0.3.0.tar.gz) = 1d07a7e7ef0677e5934331ed0b80b92c7bba7074 Size (pspp-0.3.0.tar.gz) = 1122999 bytes @@ -11,3 +11,4 @@ SHA1 (patch-ag) = 3a565a2becf76af67e1cf6b443ed51e24b4fd0f0 SHA1 (patch-ah) = 8fd5821c09fcc5ea4f96a198186c99e0d958842d SHA1 (patch-ai) = f6886d4cd3779f71353dc0e013f3b37b86fe7474 SHA1 (patch-aj) = e34a0638b8226efdf33cee4eccd40fc4dcaf6210 +SHA1 (patch-ak) = fc3eee590babb3730c76a8226a4549f32a942280 diff --git a/math/pspp/patches/patch-ak b/math/pspp/patches/patch-ak new file mode 100644 index 00000000000..035f84df309 --- /dev/null +++ b/math/pspp/patches/patch-ak @@ -0,0 +1,215 @@ +$NetBSD: patch-ak,v 1.1 2002/10/02 21:23:19 dillo Exp $ + +--- configure.orig Wed Oct 2 23:18:02 2002 ++++ configure +@@ -3611,46 +3611,8 @@ 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_%'` +-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" +-cat > conftest.$ac_ext <<EOF +-#line 3624 "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 +- builtin and then its argument prototype would still apply. */ +-char tgetent(); +- +-int main() { +-tgetent() +-; return 0; } +-EOF +-if { (eval echo configure:3635: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-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 +-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 ++echo "configure:3616: 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 +@@ -3690,8 +3652,6 @@ else + termcap=no + fi + +-fi +- + if test "$termcap" = yes; then + for ac_hdr in termcap.h + do +@@ -3739,8 +3699,46 @@ EOF + + fi + ++echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 ++echo "configure:3704: 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="-ledit $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 3712 "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 ++ builtin and then its argument prototype would still apply. */ ++char readline(); ++ ++int main() { ++readline() ++; return 0; } ++EOF ++if { (eval echo configure:3723: \"$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 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ readlinelib=edit have_readline=yes ++else ++ echo "$ac_t""no" 1>&6 + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +-echo "configure:3744: checking for readline in -lreadline" >&5 ++echo "configure:3742: 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 +@@ -3774,20 +3772,17 @@ 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 +-EOF +- +- LIBS="-lreadline $LIBS" +- ++ readlinelib=readline have_readline=yes + else + echo "$ac_t""no" 1>&6 ++readline=no ++fi ++ + fi + +-if test "$ac_cv_lib_readline_readline" = yes; then +- for ac_hdr in readline/readline.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 +@@ -3827,16 +3822,63 @@ else + 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_%'` ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBREADLINE 1 ++EOF ++ ++ echo $ac_n "checking for tilde_expand in -l$readlinelib""... $ac_c" 1>&6 ++echo "configure:3831: 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 3839 "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 ++ builtin and then its argument prototype would still apply. */ ++char tilde_expand(); ++ ++int main() { ++tilde_expand() ++; return 0; } ++EOF ++if { (eval echo configure:3850: \"$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 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_TILDE_EXPAND 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ echo $ac_n "checking for add_history in -l$readlinelib""... $ac_c" 1>&6 ++echo "configure:3874: 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="-l$readlinelib $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 3840 "configure" ++#line 3882 "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 +3951,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 |