diff options
Diffstat (limited to 'devel/ncurses/patches/patch-ab')
| -rw-r--r-- | devel/ncurses/patches/patch-ab | 119 |
1 files changed, 81 insertions, 38 deletions
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab index ec40640a0fa..4d3a14e3d00 100644 --- a/devel/ncurses/patches/patch-ab +++ b/devel/ncurses/patches/patch-ab @@ -1,43 +1,86 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:26 agc Exp $ +$NetBSD: patch-ab,v 1.4 1999/07/06 07:51:04 jlam Exp $ ---- configure.orig Sun Dec 1 03:08:35 1996 -+++ configure Sun Feb 1 18:10:55 1998 -@@ -605,14 +605,7 @@ - echo $ac_n "checking for default include-directory""... $ac_c" 1>&6 - echo "configure:607: checking for default include-directory" >&5 - for nc_symbol in \ -- $includedir \ -- $includedir/ncurses \ -- $prefix/include \ -- $prefix/include/ncurses \ -- /usr/include \ -- /usr/include/ncurses \ -- /usr/local/include \ -- /usr/local/include/ncurses -+ $includedir - do - nc_dir=`eval echo $nc_symbol` - if test -f $nc_dir/curses.h ; then -@@ -1283,12 +1283,7 @@ +--- configure.orig Thu Feb 12 18:46:01 1998 ++++ configure Fri Jul 2 03:04:33 1999 +@@ -1628,6 +1628,7 @@ + test -z "$cf_dir" && cf_dir=/usr/man + cf_rename="" + cf_format=no ++ if false ; then # install unformatted man pages + for cf_name in $cf_dir/*/date.[01]* $cf_dir/*/date do - nc_test=`echo $nc_name | sed -e 's/*//'` - if test "x$nc_test" = "x$nc_name" ; then -- case "$nc_name" in -- *.gz) nc_form=gzip; nc_name=`basename $nc_name .gz`;; -- *.Z) nc_form=compress; nc_name=`basename $nc_name .Z`;; -- *.0) nc_form=BSDI; nc_format=yes;; -- *) nc_form=cat;; -- esac -+ nc_form=cat + cf_test=`echo $cf_name | sed -e 's/*//'` +@@ -1641,6 +1642,8 @@ break fi done -@@ -1392,7 +1387,7 @@ - BSDI) - cat >>man/edit_man.sh <<NC_EOF - # BSDI installs only .0 suffixes in the cat directories -- target="\`echo \$target|sed -e 's/\.[1-9]\+.\?/.0/'\`" -+ target="\`echo \$target|sed -e 's/\.[1-9]\(\.gz|\.Z\)\{0,1\}/.0\1/'\`" - NC_EOF - ;; - esac ++ else cf_form=cat ++ fi + if test "$cf_form" != "unknown" ; then + break + fi +@@ -2103,7 +2106,7 @@ + + + case $DFT_LWR_MODEL in +- normal) DFT_DEP_SUFFIX='.a' ;; ++ normal) DFT_DEP_SUFFIX='.la' ;; + debug) DFT_DEP_SUFFIX='_g.a' ;; + profile) DFT_DEP_SUFFIX='_p.a' ;; + shared) +@@ -5310,7 +5313,7 @@ + + # dependencies and linker-arguments for test-programs + TEST_DEPS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS" +-TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" ++TEST_ARGS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_ARGS" + + # dependencies and linker-arguments for utility-programs + PROG_ARGS="$TEST_ARGS" +@@ -5353,16 +5356,16 @@ + EOF + + TEST_DEPS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" +- TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" ++ TEST_ARGS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_ARGS" + fi + fi + done + echo "$ac_t""$cf_cv_src_modules" 1>&6 +-TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS" ++TEST_ARGS="-L\$(libdir) $TEST_ARGS" + + + +-PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS" ++PROG_ARGS="-L\$(libdir) $PROG_ARGS" + + + SRC_SUBDIRS="man include" +@@ -5888,7 +5891,7 @@ + + + case $cf_item in +- normal) cf_suffix='.a' ;; ++ normal) cf_suffix='.la' ;; + debug) cf_suffix='_g.a' ;; + profile) cf_suffix='_p.a' ;; + shared) +@@ -5931,7 +5934,7 @@ + + + case $cf_item in +- normal) cf_suffix='.a' ;; ++ normal) cf_suffix='.la' ;; + debug) cf_suffix='_g.a' ;; + profile) cf_suffix='_p.a' ;; + shared) +@@ -6120,7 +6123,7 @@ + for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"` + do + echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile +- test $i = curses.h && echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile ++ test $i = curses.h && echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && mv -f curses.h ncurses.h)" >>$cf_dir/Makefile + done + + cat >>$cf_dir/Makefile <<CF_EOF |