summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/ncurses/Makefile4
-rw-r--r--devel/ncurses/files/md53
-rw-r--r--devel/ncurses/files/patch-sum19
-rw-r--r--devel/ncurses/patches/patch-aa84
-rw-r--r--devel/ncurses/patches/patch-ab212
-rw-r--r--devel/ncurses/patches/patch-ac104
-rw-r--r--devel/ncurses/patches/patch-ad78
-rw-r--r--devel/ncurses/patches/patch-ae319
-rw-r--r--devel/ncurses/patches/patch-af39
-rw-r--r--devel/ncurses/patches/patch-ag40
-rw-r--r--devel/ncurses/patches/patch-ah14
-rw-r--r--devel/ncurses/patches/patch-ai58
-rw-r--r--devel/ncurses/patches/patch-aj16
-rw-r--r--devel/ncurses/patches/patch-ak39
-rw-r--r--devel/ncurses/patches/patch-al39
-rw-r--r--devel/ncurses/patches/patch-am91
-rw-r--r--devel/ncurses/patches/patch-an48
-rw-r--r--devel/ncurses/patches/patch-ao34
18 files changed, 58 insertions, 1183 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 314148ffdfc..9255cf8b364 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2000/10/12 16:27:58 pooka Exp $
+# $NetBSD: Makefile,v 1.34 2000/10/15 04:50:11 jlam Exp $
DISTNAME= ncurses-${NC_VERS}
NC_VERS= 5.1
@@ -7,6 +7,8 @@ MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \
ftp://dickey.his.com/ncurses/ \
ftp://dickey.his.com/ncurses/${NC_VERS}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NC_PATCH}
+PATCHFILES= ${DISTNAME}-20001014.patch.gz
+PATCH_SITES= ftp://dickey.his.com/ncurses/${NC_VERS}/
MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://dickey.his.com/ncurses/ncurses.html
diff --git a/devel/ncurses/files/md5 b/devel/ncurses/files/md5
index f56c37f65f7..ff44216e197 100644
--- a/devel/ncurses/files/md5
+++ b/devel/ncurses/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.7 2000/10/12 16:27:59 pooka Exp $
+$NetBSD: md5,v 1.8 2000/10/15 04:50:11 jlam Exp $
MD5 (ncurses-5.1.tar.gz) = 6b379ee0b8ad607acdba9c8039818921
MD5 (patch-5.1-20001009.sh) = e63c4c6d8de31024558c513864145f9a
+MD5 (ncurses-5.1-20001014.patch.gz) = b2ba2a1e7e18245227852479ca5d5b2c
diff --git a/devel/ncurses/files/patch-sum b/devel/ncurses/files/patch-sum
index 5c07e9636e9..6875f88ee22 100644
--- a/devel/ncurses/files/patch-sum
+++ b/devel/ncurses/files/patch-sum
@@ -1,17 +1,4 @@
-$NetBSD: patch-sum,v 1.7 2000/10/12 14:56:45 jlam Exp $
+$NetBSD: patch-sum,v 1.8 2000/10/15 04:50:11 jlam Exp $
-MD5 (patch-aa) = 2dffc61a1dc9d992901a142a53e496b8
-MD5 (patch-ab) = 9c7ca4152679a5c50e3a8a95cfff24d9
-MD5 (patch-ac) = 5c0d0db3de053cfc2fa9cfb2a4266c14
-MD5 (patch-ad) = c86dfe299ab580ecaf467441c6c99060
-MD5 (patch-ae) = e01ab583cd867a51fa0734530eedd04a
-MD5 (patch-af) = 2f76777d03ec63e2f711b5dca265646c
-MD5 (patch-ag) = 4e88825a4ccced424719ccdf51353a9d
-MD5 (patch-ah) = 29604935e46e2762fbbc5fcf93d6369e
-MD5 (patch-ai) = b6adb05de8f6d9da251ee077846f0c8a
-MD5 (patch-aj) = 34aaf656d7d443fba7d158b27b8a4c9d
-MD5 (patch-ak) = 3b0505a78df98ce43476926217dbe0c5
-MD5 (patch-al) = aab23491177da0d0c3e0330436af05e9
-MD5 (patch-am) = 744cdf10103792fae45516d7bab920cd
-MD5 (patch-an) = 378db1107080ce563a2ad9613893122d
-MD5 (patch-ao) = 77ad4b9d0d2505157e8519c05344a2dc
+MD5 (patch-aa) = 29604935e46e2762fbbc5fcf93d6369e
+MD5 (patch-ab) = 5ac3b035cdf0995723ae278b9f6cbce3
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
index 412cfb6df34..9cd5eb6436b 100644
--- a/devel/ncurses/patches/patch-aa
+++ b/devel/ncurses/patches/patch-aa
@@ -1,72 +1,14 @@
-$NetBSD: patch-aa,v 1.10 2000/10/12 14:56:45 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2000/10/15 04:50:11 jlam Exp $
---- INSTALL.orig Thu Oct 12 04:52:50 2000
-+++ INSTALL
-@@ -104,6 +104,8 @@
-
- libncurses_p.a (profile)
-
-+ libncurses.la (libtool)
-+
- If you do not specify any models, the normal and debug libraries will be
- configured. Typing `configure' with no arguments is equivalent to:
-
-@@ -126,6 +128,13 @@
- and SunOS with gcc, but more work needs to be done to make shared libraries
- work on other systems.
-
-+ If you have libtool installed, you can type
-+
-+ ./configure --with-libtool
-+
-+ to generate the appropriate static and/or shared libraries for your
-+ platform using libtool.
-+
- You can make curses and terminfo fall back to an existing file of termcap
- definitions by configuring with --enable-termcap. If you do this, the
- library will search /etc/termcap before the terminfo database, and will
-@@ -176,7 +185,8 @@
- The terminfo(5) manual page must be preprocessed with tbl(1) before
- being formatted by nroff(1). Modern man(1) implementations tend to do
- this by default, but you may want to look at your version's manual page
-- to be sure.
-+ to be sure. You may also install the manual pages after preprocessing
-+ with tbl(1) by specifying the configure option --with-manpage-tbl.
-
- If the system already has a curses library that you need to keep using
- for some bizarre binary-compatibility reason, you'll need to distinguish
-@@ -494,6 +504,10 @@
- NOTE: a few systems build shared libraries with fixed pathnames; this
- option probably will not work for those configurations.
-
-+ --with-libtool
-+ Generate libraries with libtool. If this option is selected, then
-+ it overrides all other library model specifications.
-+
- --with-manpage-format=XXX
- Tell the configure script how you would like to install man-pages. The
- option value must be one of these: gzip, compress, BSDI, normal,
-@@ -513,6 +527,11 @@
- this on systems that do not support symbolic links will result in
- copying the man-page for each alias.
-
-+ --with-manpage-tbl
-+ Tell the configure script that you with to preprocess the manpages
-+ by running them through tbl to generate tables understandable by
-+ nroff.
-+
- --with-normal
- Generate normal (i.e., static) libraries (default).
-
-@@ -557,6 +576,11 @@
- --without-ada
- Suppress the configure script's check for Ada95, do not build the
- Ada95 binding and related demo.
-+
-+ --without-curses-h
-+ Don't install the ncurses header with the name "curses.h". Rather,
-+ install as "ncurses.h" and modify the installed headers and manpages
-+ accordingly.
-
- --without-cxx
- XSI curses declares "bool" as part of the interface. C++ also declares
+--- misc/run_tic.in.orig Mon Oct 9 18:57:35 2000
++++ misc/run_tic.in
+@@ -113,6 +113,9 @@
+ exit 1
+ fi
+
++# For NetBSD pkgsrc, don't bother with setting a symbolic link.
++exit 0
++
+ # Make a symbolic link to provide compatibility with applications that expect
+ # to find terminfo under /usr/lib. That is, we'll _try_ to do that. Not
+ # all systems support symbolic links, and those that do provide a variety
diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab
index 0fce42ae899..953043359fb 100644
--- a/devel/ncurses/patches/patch-ab
+++ b/devel/ncurses/patches/patch-ab
@@ -1,181 +1,43 @@
-$NetBSD: patch-ab,v 1.9 2000/10/12 14:56:45 jlam Exp $
+$NetBSD: patch-ab,v 1.10 2000/10/15 04:50:11 jlam Exp $
---- aclocal.m4.orig Thu Oct 12 04:52:50 2000
-+++ aclocal.m4
-@@ -1000,27 +1000,62 @@
- DST=\[$]1
- REF=\[$]2
- SRC=\[$]3
-+TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
-+TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
- echo installing \$SRC in \$DST
-+CF_EOF
-+if test $WITH_CURSES_H = yes; then
-+ cat >>headers.sh <<CF_EOF
- case \$DST in
- /*/include/*)
-- TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
-- TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
- END=\`basename \$DST\`
- for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
- do
- NAME=\`basename \$i\`
- echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
- done
-- rm -f \$TMPSRC
-- sed -f \$TMPSED \$SRC > \$TMPSRC
-- eval \$PRG \$TMPSRC \$DST/\`basename \$SRC\`
-- rm -f \$TMPSRC \$TMPSED
- ;;
- *)
-- eval \$PRG \$SRC \$DST
-+ echo "" >> \$TMPSED
- ;;
- esac
- CF_EOF
-+else
-+ cat >>headers.sh <<CF_EOF
-+case \$DST in
-+/*/include/*)
-+ END=\`basename \$DST\`
-+ for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
-+ do
-+ NAME=\`basename \$i\`
-+ if test "\$NAME" = "curses.h"
-+ then
-+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
-+ NAME=ncurses.h
-+ fi
-+ echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
-+ done
-+ ;;
-+*)
-+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
-+ ;;
-+esac
-+CF_EOF
-+fi
-+cat >>headers.sh <<CF_EOF
-+rm -f \$TMPSRC
-+sed -f \$TMPSED \$SRC > \$TMPSRC
-+NAME=\`basename \$SRC\`
-+CF_EOF
-+if test $WITH_CURSES_H != yes; then
-+ cat >>headers.sh <<CF_EOF
-+test "\$NAME" = "curses.h" && NAME=ncurses.h
-+CF_EOF
-+fi
-+cat >>headers.sh <<CF_EOF
-+eval \$PRG \$TMPSRC \$DST/\$NAME
-+rm -f \$TMPSRC \$TMPSED
-+CF_EOF
+--- progs/Makefile.in.orig Sun Oct 15 00:11:15 2000
++++ progs/Makefile.in
+@@ -107,7 +107,7 @@
+ termsort.c \
+ transform.h
- chmod 0755 headers.sh
+-PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x
++PROGS = tic$x toe$x infocmp$x
-@@ -1045,7 +1080,7 @@
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(DESTDIR)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile
-- test $i = curses.h && echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile
-+ test $i = curses.h && test $WITH_CURSES_H = yes && echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile
- done
+ TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x
- cat >>$cf_dir/Makefile <<CF_EOF
-@@ -1073,6 +1108,7 @@
- [
- AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
- case $1 in
-+ libtool) $2='.la' ;;
- normal) $2='.a' ;;
- debug) $2='_g.a' ;;
- profile) $2='_p.a' ;;
-@@ -1092,6 +1128,7 @@
- AC_DEFUN([CF_LIB_TYPE],
- [
- case $1 in
-+ libtool) $2='' ;;
- normal) $2='' ;;
- debug) $2='_g' ;;
- profile) $2='_p' ;;
-@@ -1387,6 +1424,20 @@
- AC_MSG_RESULT($cf_manpage_symlinks)
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl This option causes manpages to be run through tbl(1) to generate tables
-+dnl correctly.
-+AC_DEFUN([CF_MANPAGE_TBL],
-+[
-+AC_MSG_CHECKING(for manpage tbl)
-+
-+AC_ARG_WITH(manpage-tbl,
-+ [ --with-manpage-tbl specify manpage processing with tbl],
-+ [cf_manpage_tbl=$withval],
-+ [cf_manpage_tbl=yes])
-+
-+AC_MSG_RESULT($cf_manpage_tbl)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl Try to determine if the man-pages on the system are compressed, and if
- dnl so, what format is used. Use this information to construct a script that
- dnl will install man-pages.
-@@ -1396,6 +1447,7 @@
- CF_MANPAGE_FORMAT
- CF_MANPAGE_RENAMES
- CF_MANPAGE_SYMLINKS
-+CF_MANPAGE_TBL
+@@ -150,29 +150,19 @@
+ $(LIBTOOL) $(INSTALL_PROGRAM) tic$x $(DESTDIR)$(bindir)/$(actual_tic)
+ $(LIBTOOL) $(INSTALL_PROGRAM) toe$x $(DESTDIR)$(bindir)/$(actual_toe)
+ $(LIBTOOL) $(INSTALL_PROGRAM) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
+- $(LIBTOOL) $(INSTALL_PROGRAM) clear$x $(DESTDIR)$(bindir)/$(actual_clear)
+- $(LIBTOOL) $(INSTALL_PROGRAM) tput$x $(DESTDIR)$(bindir)/$(actual_tput)
+- $(LIBTOOL) $(INSTALL_PROGRAM) tset$x $(DESTDIR)$(bindir)/$(actual_tset)
+ @echo "linking $(actual_captoinfo) to $(actual_tic)"
+ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
+ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
+ @echo "linking $(actual_infotocap) to $(actual_tic)"
+ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap))
+- @echo "linking $(actual_reset) to $(actual_tset)"
+- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
+- (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset))
- if test "$prefix" = "NONE" ; then
- cf_prefix="$ac_default_prefix"
-@@ -1509,6 +1561,18 @@
- test \$verb = installing && sed -e "s,@DATADIR@,\$datadir," < \$i | sed -f edit_man.sed >\$TMP
- CF_EOF
- fi
-+if test $cf_manpage_tbl = yes ; then
-+cat >>man/edit_man.sh <<CF_EOF
-+ tbl \$TMP >\$TMP.out
-+ mv \$TMP.out \$TMP
-+CF_EOF
-+fi
-+if test $with_curses_h != yes ; then
-+cat >>man/edit_man.sh <<CF_EOF
-+ sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-+ mv \$TMP.out \$TMP
-+CF_EOF
-+fi
- if test $cf_format = yes ; then
- cat >>man/edit_man.sh <<CF_EOF
- nroff -man \$TMP >\$TMP.out
-@@ -1645,6 +1709,7 @@
- AC_DEFUN([CF_OBJ_SUBDIR],
- [
- case $1 in
-+ libtool) $2='obj_lo' ;;
- normal) $2='objects' ;;
- debug) $2='obj_g' ;;
- profile) $2='obj_p' ;;
-@@ -2066,7 +2131,11 @@
+ uninstall.progs:
+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_toe)
+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
+- -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
+- -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
+- -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
+ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
+ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
+- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
- # dependencies and linker-arguments for test-programs
- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
--TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+if test "$DFT_LWR_MODEL" = "libtool"; then
-+ TEST_ARGS="${TEST_DEPS}"
-+else
-+ TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+fi
-
- # dependencies and linker-arguments for utility-programs
- PROG_ARGS="$TEST_ARGS"
-@@ -2101,7 +2170,11 @@
- AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
- AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})
- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
-- TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+ if test "$DFT_LWR_MODEL" = "libtool"; then
-+ TEST_ARGS="${TEST_DEPS}"
-+ else
-+ TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+ fi
- fi
- fi
- done
+ $(DESTDIR)$(bindir) :
+ $(srcdir)/../mkinstalldirs $@
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
deleted file mode 100644
index 74f5de3acb6..00000000000
--- a/devel/ncurses/patches/patch-ac
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2000/10/12 14:56:45 jlam Exp $
-
---- c++/Makefile.in.orig Thu Oct 12 04:52:50 2000
-+++ c++/Makefile.in
-@@ -48,6 +48,8 @@
- libdir = @libdir@
- includedir = @includedir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
-@@ -64,6 +66,7 @@
-
- CCFLAGS = $(CPPFLAGS) $(CXXFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CXX_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -71,25 +74,37 @@
-
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
-+NCURSES_MAJOR = @NCURSES_MAJOR@
-+NCURSES_MINOR = @NCURSES_MINOR@
- REL_VERSION = @cf_cv_rel_version@
- ABI_VERSION = @cf_cv_abi_version@
-
--LINK = @LINK_PROGS@ $(CXX) @CXXLDFLAGS@
-+LINK = @LINK_PROGS@ $(LIBTOOL) $(CXX) @CXXLDFLAGS@
-+
-+LIBROOT = ncurses++
-+LIBNAME = @LIB_PREFIX@$(LIBROOT)@DFT_DEP_SUFFIX@
-+
-+LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
-+LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
-
--LIBROOT = ncurses++@LIB_SUFFIX@
--LIBNAME = @LIB_PREFIX@$(LIBROOT).a
-+LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT)
-
--LDFLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \
-- -l$(LIBROOT) \
-- @TEST_ARGS@ @LDFLAGS@ \
-+LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME)
-+LINK_NORMAL = $(LINK_FLAGS)
-+LINK_DEBUG = $(LINK_FLAGS)
-+LINK_PROFILE = $(LINK_FLAGS)
-+LINK_SHARED = $(LINK_FLAGS)
-+
-+LDFLAGS = @TEST_ARGS@ @LDFLAGS@ \
- @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
-
-+LDFLAGS_LIBTOOL = $(LDFLAGS)
- LDFLAGS_NORMAL = $(LDFLAGS)
- LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
- LDFLAGS_PROFILE = $(LDFLAGS) -pg
- LDFLAGS_SHARED = $(LDFLAGS) @LD_SHARED_OPTS@
-
--LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
-+LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
-
- AUTO_SRC = \
- etip.h
-@@ -114,10 +129,15 @@
- $(MODEL)/cursesapp.o \
- $(MODEL)/cursesmain.o
-
--../lib/$(LIBNAME) : $(LIB_OBJS)
-+../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
- $(AR) $(AR_OPTS) $@ $?
- $(RANLIB) $@
-
-+../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
-+ cd ../lib && $(LIBTOOL) $(CXX) -o $(LIBNAME) $(LIB_OBJS:.o=.lo) \
-+ -rpath $(INSTALL_PREFIX)$(libdir) \
-+ -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)
-+
- OBJS_DEMO = $(MODEL)/demo.o
-
- $(MODEL)/demo.o : $(srcdir)/demo.cc \
-@@ -137,17 +157,17 @@
-
- install \
- install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
-- $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-+ $(LIBTOOL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-
- uninstall \
- uninstall.libs::
-- -rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
-+ -$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
-
- mostlyclean ::
- -rm -f core tags TAGS *~ *.ln *.atac trace
-
- clean :: mostlyclean
-- -rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
-+ -$(LIBTOOL) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:.o=.lo) $(OBJS_DEMO)
-
- distclean :: clean
- -rm -f Makefile
diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad
deleted file mode 100644
index 49f92789a66..00000000000
--- a/devel/ncurses/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2000/10/12 14:56:45 jlam Exp $
-
---- configure.in.orig Thu Oct 12 04:52:53 2000
-+++ configure.in
-@@ -162,6 +162,13 @@
- [cf_with_progs=yes])
- AC_MSG_RESULT($cf_with_progs)
-
-+AC_MSG_CHECKING(if you wish to install curses.h)
-+AC_ARG_WITH(curses-h,
-+ [ --without-curses-h install curses.h as ncurses.h only],
-+ [with_curses_h=$withval],
-+ [with_curses_h=yes])
-+AC_MSG_RESULT($with_curses_h)
-+
- modules_to_build="ncurses"
- if test "X$cf_with_progs" != Xno ; then
- modules_to_build="$modules_to_build progs tack"
-@@ -212,6 +219,20 @@
- cf_list_models=""
- AC_SUBST(cf_list_models)dnl the complete list of models ("normal debug")
-
-+AC_MSG_CHECKING(if you want to build libraries with libtool)
-+AC_ARG_WITH(libtool,
-+ [ --with-libtool generate libraries with libtool],
-+ [with_libtool=$withval],
-+ [with_libtool=no])
-+AC_MSG_RESULT($with_libtool)
-+if test "$with_libtool" = "yes"; then
-+ cf_list_models="$cf_list_models libtool"
-+ test -z "$LIBTOOL" && LIBTOOL=libtool
-+else
-+ LIBTOOL=""
-+fi
-+AC_SUBST(LIBTOOL)
-+
- AC_MSG_CHECKING(if you want to build shared libraries)
- AC_ARG_WITH(shared,
- [ --with-shared generate shared-libraries],
-@@ -248,6 +269,9 @@
-
- AC_MSG_CHECKING(for specified models)
- test -z "$cf_list_models" && cf_list_models=normal
-+dnl If we use libtool to generate libraries, then it must be the only
-+dnl specified model.
-+test "$with_libtool" = "yes" && cf_list_models=libtool
- AC_MSG_RESULT($cf_list_models)
-
- ### Use the first model as the default, and save its suffix for use in building
-@@ -337,6 +361,7 @@
-
- AC_MSG_CHECKING(for default loader flags)
- case $DFT_LWR_MODEL in
-+libtool) LD_MODEL='' ;;
- normal) LD_MODEL='' ;;
- debug) LD_MODEL=$CC_G_OPT ;;
- profile) LD_MODEL='-pg';;
-@@ -1075,7 +1100,11 @@
- ### could override this.
- if test "$with_termlib" = yes ; then
- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}"
-- TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
-+ if test "$DFT_LWR_MODEL" = "libtool"; then
-+ TEST_ARGS="${TEST_DEPS}"
-+ else
-+ TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
-+ fi
- fi
- PROG_DEPS="$TEST_DEPS"
- PROG_ARGS="$TEST_ARGS"
-@@ -1116,6 +1145,7 @@
- TINFO_NAME="$TINFO_NAME"
- WITH_ECHO="$with_echo"
- WITH_OVERWRITE="$with_overwrite"
-+WITH_CURSES_H="$with_curses_h"
- cf_cv_abi_version="$cf_cv_abi_version"
- cf_cv_do_symlinks="$cf_cv_do_symlinks"
- cf_cv_rel_version="$cf_cv_rel_version"
diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae
deleted file mode 100644
index ca3c8d65637..00000000000
--- a/devel/ncurses/patches/patch-ae
+++ /dev/null
@@ -1,319 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/10/12 14:56:45 jlam Exp $
-
---- configure.orig Thu Oct 12 04:52:53 2000
-+++ configure
-@@ -193,8 +193,10 @@
- --without-cxx-binding do not build C++ binding and demo
- --without-ada suppress check for Ada95, don't build demo
- --without-progs suppress build with programs (e.g., tic)
-+ --without-curses-h install curses.h as ncurses.h only
- --with-install-prefix prefixes actual install-location
- Options to Specify the Libraries Built/Used:
-+ --with-libtool generate libraries with libtool
- --with-shared generate shared-libraries
- --with-normal generate normal-libraries (default)
- --with-debug generate debug-libraries (default)
-@@ -229,6 +231,7 @@
- optionally formatted, e.g., gzip,formatted
- --with-manpage-renames specify manpage-renaming
- --with-manpage-symlinks specify manpage-symlinks
-+ --with-manpage-tbl specify manpage processing with tbl
- EOF
- cat <<EOF
- Extensions:
-@@ -1605,6 +1608,19 @@
-
- echo "$ac_t""$cf_with_progs" 1>&6
-
-+echo $ac_n "checking if you wish to install curses.h""... $ac_c" 1>&6
-+echo "configure:1597: checking if you wish to install curses.h" >&5
-+
-+# Check whether --with-curses-h or --without-curses-h was given.
-+if test "${with_curses_h+set}" = set; then
-+ withval="$with_curses_h"
-+ with_curses_h=$withval
-+else
-+ with_curses_h=yes
-+fi
-+
-+echo "$ac_t""$with_curses_h" 1>&6
-+
- modules_to_build="ncurses"
- if test "X$cf_with_progs" != Xno ; then
- modules_to_build="$modules_to_build progs tack"
-@@ -2141,6 +2157,25 @@
- ### shared, for example.
- cf_list_models=""
-
-+echo $ac_n "checking if you want to build libraries with libtool""... $ac_c" 1>&6
-+echo "configure:2146: checking if you want to build libraries with libtool" >&5
-+
-+# Check whether --with-libtool or --without-libtool was given.
-+if test "${with_libtool+set}" = set; then
-+ withval="$with_libtool"
-+ with_libtool=$withval
-+else
-+ with_libtool=no
-+fi
-+
-+echo "$ac_t""$with_libtool" 1>&6
-+if test "$with_libtool" = "yes"; then
-+ cf_list_models="$cf_list_models libtool"
-+ test -z "$LIBTOOL" && LIBTOOL=libtool
-+else
-+ LIBTOOL=""
-+fi
-+
- echo $ac_n "checking if you want to build shared libraries""... $ac_c" 1>&6
- echo "configure:2146: checking if you want to build shared libraries" >&5
-
-@@ -2202,6 +2237,9 @@
- echo $ac_n "checking for specified models""... $ac_c" 1>&6
- echo "configure:2204: checking for specified models" >&5
- test -z "$cf_list_models" && cf_list_models=normal
-+# If we use libtool to generate libraries, then it must be the only
-+# specified model.
-+test "$with_libtool" = "yes" && cf_list_models=libtool
- echo "$ac_t""$cf_list_models" 1>&6
-
- ### Use the first model as the default, and save its suffix for use in building
-@@ -2496,6 +2534,7 @@
- echo $ac_n "checking for default loader flags""... $ac_c" 1>&6
- echo "configure:2498: checking for default loader flags" >&5
- case $DFT_LWR_MODEL in
-+libtool) LD_MODEL='' ;;
- normal) LD_MODEL='' ;;
- debug) LD_MODEL=$CC_G_OPT ;;
- profile) LD_MODEL='-pg';;
-@@ -3469,6 +3508,22 @@
- echo "$ac_t""$cf_manpage_symlinks" 1>&6
-
-
-+echo $ac_n "checking for manpage tbl""... $ac_c" 1>&6
-+echo "configure:3458: checking for manpage tbl" >&5
-+
-+
-+# Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-+if test "${with_manpage_tbl+set}" = set; then
-+ withval="$with_manpage_tbl"
-+ cf_manpage_tbl=$withval
-+else
-+ cf_manpage_tbl=yes
-+fi
-+
-+
-+echo "$ac_t""$cf_manpage_tbl" 1>&6
-+
-+
- if test "$prefix" = "NONE" ; then
- cf_prefix="$ac_default_prefix"
- else
-@@ -3580,6 +3635,18 @@
- test \$verb = installing && sed -e "s,@DATADIR@,\$datadir," < \$i | sed -f edit_man.sed >\$TMP
- CF_EOF
- fi
-+if test $cf_manpage_tbl = yes ; then
-+cat >>man/edit_man.sh <<CF_EOF
-+ tbl \$TMP >\$TMP.out
-+ mv \$TMP.out \$TMP
-+CF_EOF
-+fi
-+if test $with_curses_h != yes ; then
-+cat >>man/edit_man.sh <<CF_EOF
-+ sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out
-+ mv \$TMP.out \$TMP
-+CF_EOF
-+fi
- if test $cf_format = yes ; then
- cat >>man/edit_man.sh <<CF_EOF
- nroff -man \$TMP >\$TMP.out
-@@ -6964,6 +7031,7 @@
- echo "configure:6965: checking default library suffix" >&5
-
- case $DFT_LWR_MODEL in
-+ libtool) DFT_ARG_SUFFIX='' ;;
- normal) DFT_ARG_SUFFIX='' ;;
- debug) DFT_ARG_SUFFIX='_g' ;;
- profile) DFT_ARG_SUFFIX='_p' ;;
-@@ -6977,6 +7045,7 @@
-
-
- case $DFT_LWR_MODEL in
-+ libtool) DFT_DEP_SUFFIX='.la' ;;
- normal) DFT_DEP_SUFFIX='.a' ;;
- debug) DFT_DEP_SUFFIX='_g.a' ;;
- profile) DFT_DEP_SUFFIX='_p.a' ;;
-@@ -6993,6 +7062,7 @@
- echo "configure:6994: checking default object directory" >&5
-
- case $DFT_LWR_MODEL in
-+ libtool) DFT_OBJ_SUBDIR='obj_lo' ;;
- normal) DFT_OBJ_SUBDIR='objects' ;;
- debug) DFT_OBJ_SUBDIR='obj_g' ;;
- profile) DFT_OBJ_SUBDIR='obj_p' ;;
-@@ -7018,7 +7088,11 @@
- ### could override this.
- if test "$with_termlib" = yes ; then
- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}"
-- TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
-+ if test "$DFT_LWR_MODEL" = "libtool"; then
-+ TEST_ARGS="${TEST_DEPS}"
-+ else
-+ TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}"
-+ fi
- fi
- PROG_DEPS="$TEST_DEPS"
- PROG_ARGS="$TEST_ARGS"
-@@ -7032,7 +7106,11 @@
-
- # dependencies and linker-arguments for test-programs
- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
--TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+if test "$DFT_LWR_MODEL" = "libtool"; then
-+ TEST_ARGS="${TEST_DEPS}"
-+else
-+ TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+fi
-
- # dependencies and linker-arguments for utility-programs
- PROG_ARGS="$TEST_ARGS"
-@@ -7075,7 +7153,11 @@
- EOF
-
- TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
-- TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+ if test "$DFT_LWR_MODEL" = "libtool"; then
-+ TEST_ARGS="${TEST_DEPS}"
-+ else
-+ TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS"
-+ fi
- fi
- fi
- done
-@@ -7121,6 +7203,7 @@
- do
-
- case $cf_item in
-+ libtool) cf_subdir='obj_lo' ;;
- normal) cf_subdir='objects' ;;
- debug) cf_subdir='obj_g' ;;
- profile) cf_subdir='obj_p' ;;
-@@ -7257,6 +7340,7 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@LIBTOOL@%$LIBTOOL%g
- s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
-@@ -7611,6 +7695,7 @@
- TINFO_NAME="$TINFO_NAME"
- WITH_ECHO="$with_echo"
- WITH_OVERWRITE="$with_overwrite"
-+WITH_CURSES_H="$with_curses_h"
- cf_cv_abi_version="$cf_cv_abi_version"
- cf_cv_do_symlinks="$cf_cv_do_symlinks"
- cf_cv_rel_version="$cf_cv_rel_version"
-@@ -7645,6 +7730,7 @@
-
-
- case $cf_item in
-+ libtool) cf_suffix='.la' ;;
- normal) cf_suffix='.a' ;;
- debug) cf_suffix='_g.a' ;;
- profile) cf_suffix='_p.a' ;;
-@@ -7695,6 +7781,7 @@
-
-
- case $cf_item in
-+ libtool) cf_suffix='.la' ;;
- normal) cf_suffix='.a' ;;
- debug) cf_suffix='_g.a' ;;
- profile) cf_suffix='_p.a' ;;
-@@ -7708,6 +7795,7 @@
-
-
- case $cf_item in
-+ libtool) cf_subdir='obj_lo' ;;
- normal) cf_subdir='objects' ;;
- debug) cf_subdir='obj_g' ;;
- profile) cf_subdir='obj_p' ;;
-@@ -7857,27 +7945,62 @@
- DST=\$1
- REF=\$2
- SRC=\$3
-+TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
-+TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
- echo installing \$SRC in \$DST
-+CF_EOF
-+if test $WITH_CURSES_H = yes; then
-+ cat >>headers.sh <<CF_EOF
- case \$DST in
- /*/include/*)
-- TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$
-- TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$
- END=\`basename \$DST\`
- for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
- do
- NAME=\`basename \$i\`
- echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
- done
-- rm -f \$TMPSRC
-- sed -f \$TMPSED \$SRC > \$TMPSRC
-- eval \$PRG \$TMPSRC \$DST/\`basename \$SRC\`
-- rm -f \$TMPSRC \$TMPSED
- ;;
- *)
-- eval \$PRG \$SRC \$DST
-+ echo "" >> \$TMPSED
- ;;
- esac
- CF_EOF
-+else
-+ cat >>headers.sh <<CF_EOF
-+case \$DST in
-+/*/include/*)
-+ END=\`basename \$DST\`
-+ for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
-+ do
-+ NAME=\`basename \$i\`
-+ if test "\$NAME" = "curses.h"
-+ then
-+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
-+ NAME=ncurses.h
-+ fi
-+ echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
-+ done
-+ ;;
-+*)
-+ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
-+ ;;
-+esac
-+CF_EOF
-+fi
-+cat >>headers.sh <<CF_EOF
-+rm -f \$TMPSRC
-+sed -f \$TMPSED \$SRC > \$TMPSRC
-+NAME=\`basename \$SRC\`
-+CF_EOF
-+if test $WITH_CURSES_H != yes; then
-+ cat >>headers.sh <<CF_EOF
-+test "\$NAME" = "curses.h" && NAME=ncurses.h
-+CF_EOF
-+fi
-+cat >>headers.sh <<CF_EOF
-+eval \$PRG \$TMPSRC \$DST/\$NAME
-+rm -f \$TMPSRC \$TMPSED
-+CF_EOF
-
- chmod 0755 headers.sh
-
-@@ -7902,7 +8025,7 @@
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(DESTDIR)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile
-- test $i = curses.h && echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile
-+ test $i = curses.h && test $WITH_CURSES_H = yes && echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile
- done
-
- cat >>$cf_dir/Makefile <<CF_EOF
diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af
deleted file mode 100644
index c3b5e99b272..00000000000
--- a/devel/ncurses/patches/patch-af
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-af,v 1.4 2000/10/12 14:56:45 jlam Exp $
-
---- form/Makefile.in.orig Thu Oct 12 04:52:53 2000
-+++ form/Makefile.in
-@@ -53,6 +53,8 @@
- libdir = @libdir@
- includedir = @includedir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -72,6 +74,7 @@
-
- CCFLAGS = $(CPPFLAGS) $(CFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -79,7 +82,7 @@
-
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
--LINK = $(CC)
-+LINK = $(LIBTOOL) $(CC)
- LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
-
- SHLIB_DIRS = -L../lib -L$(libdir)
-@@ -87,6 +90,8 @@
-
- MK_SHARED_LIB = @MK_SHARED_LIB@
-
-+NCURSES_MAJOR = @NCURSES_MAJOR@
-+NCURSES_MINOR = @NCURSES_MINOR@
- REL_VERSION = @cf_cv_rel_version@
- ABI_VERSION = @cf_cv_abi_version@
-
diff --git a/devel/ncurses/patches/patch-ag b/devel/ncurses/patches/patch-ag
deleted file mode 100644
index 5c36d5eed68..00000000000
--- a/devel/ncurses/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/10/12 14:56:46 jlam Exp $
-
---- menu/Makefile.in.orig Thu Oct 12 04:52:55 2000
-+++ menu/Makefile.in
-@@ -53,6 +53,8 @@
- libdir = @libdir@
- includedir = @includedir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -72,15 +74,15 @@
-
- CCFLAGS = $(CPPFLAGS) $(CFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
--
- CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@
-
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
--LINK = $(CC)
-+LINK = $(LIBTOOL) $(CC)
- LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
-
- SHLIB_DIRS = -L../lib -L$(libdir)
-@@ -88,6 +90,8 @@
-
- MK_SHARED_LIB = @MK_SHARED_LIB@
-
-+NCURSES_MAJOR = @NCURSES_MAJOR@
-+NCURSES_MINOR = @NCURSES_MINOR@
- REL_VERSION = @cf_cv_rel_version@
- ABI_VERSION = @cf_cv_abi_version@
-
diff --git a/devel/ncurses/patches/patch-ah b/devel/ncurses/patches/patch-ah
deleted file mode 100644
index f25036fe7fd..00000000000
--- a/devel/ncurses/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2000/10/12 14:56:46 jlam Exp $
-
---- misc/run_tic.in.orig Mon Oct 9 18:57:35 2000
-+++ misc/run_tic.in
-@@ -113,6 +113,9 @@
- exit 1
- fi
-
-+# For NetBSD pkgsrc, don't bother with setting a symbolic link.
-+exit 0
-+
- # Make a symbolic link to provide compatibility with applications that expect
- # to find terminfo under /usr/lib. That is, we'll _try_ to do that. Not
- # all systems support symbolic links, and those that do provide a variety
diff --git a/devel/ncurses/patches/patch-ai b/devel/ncurses/patches/patch-ai
deleted file mode 100644
index f55dd142780..00000000000
--- a/devel/ncurses/patches/patch-ai
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2000/10/12 14:56:46 jlam Exp $
-
---- mk-1st.awk.orig Thu Oct 12 04:52:56 2000
-+++ mk-1st.awk
-@@ -215,6 +215,29 @@
- printf "\t-@rm -f so_locations\n"
- }
- }
-+ else if ( MODEL == "LIBTOOL" )
-+ {
-+ if ( $2 == "c++" ) {
-+ compile="CXX"
-+ } else {
-+ compile="CC"
-+ }
-+ end_name = lib_name;
-+ printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
-+ printf "\tcd ../lib && $(LIBTOOL) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", compile, lib_name, OBJS
-+ print ""
-+ print "install \\"
-+ print "install.libs \\"
-+ printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
-+ printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
-+ printf "\tcd ../lib; $(LIBTOOL) $(INSTALL_DATA) %s $(DESTDIR)$(libdir)\n", lib_name
-+ print ""
-+ print "uninstall \\"
-+ print "uninstall.libs \\"
-+ printf "uninstall.%s ::\n", name
-+ printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name
-+ printf "\t-@$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name
-+ }
- else
- {
- end_name = lib_name;
-@@ -266,14 +289,23 @@
- print ""
- print "mostlyclean::"
- printf "\t-rm -f $(%s_OBJS)\n", OBJS
-+ if ( MODEL == "LIBTOOL" ) {
-+ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
-+ }
- }
- else if ( found == 2 )
- {
- print ""
- print "mostlyclean::"
- printf "\t-rm -f $(%s_OBJS)\n", OBJS
-+ if ( MODEL == "LIBTOOL" ) {
-+ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
-+ }
- print ""
- print "clean ::"
- printf "\t-rm -f $(%s_OBJS)\n", OBJS
-+ if ( MODEL == "LIBTOOL" ) {
-+ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS
-+ }
- }
- }
diff --git a/devel/ncurses/patches/patch-aj b/devel/ncurses/patches/patch-aj
deleted file mode 100644
index 31b39f86364..00000000000
--- a/devel/ncurses/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2000/10/12 14:56:46 jlam Exp $
-
---- mk-2nd.awk.orig Sat Apr 1 15:50:36 2000
-+++ mk-2nd.awk
-@@ -100,9 +100,9 @@
- dir = $3 "/"
- sub("^\\$\\(srcdir\\)/","",dir);
- sub("^\\./","",dir);
-- printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix
-+ printf "\t%scd ../%s; $(LIBTOOL) $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix
- } else
-- printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
-+ printf "\t%scd ../%s; $(LIBTOOL) $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix
- } else {
- printf "%s", $1
- for (n = 2; n <= NF; n++) printf " %s", $n
diff --git a/devel/ncurses/patches/patch-ak b/devel/ncurses/patches/patch-ak
deleted file mode 100644
index c314d725fe4..00000000000
--- a/devel/ncurses/patches/patch-ak
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2000/10/12 14:56:47 jlam Exp $
-
---- ncurses/Makefile.in.orig Thu Oct 12 04:52:56 2000
-+++ ncurses/Makefile.in
-@@ -62,6 +62,8 @@
- includedir = @includedir@
- datadir = @datadir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -86,6 +88,7 @@
- HOSTCCFLAGS = @CFLAGS@ $(CPPFLAGS)
- HOSTLDFLAGS = @LDFLAGS@ @LIBS@
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -93,7 +96,7 @@
-
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
--LINK = $(CC)
-+LINK = $(LIBTOOL) $(CC)
- LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
-
- SHLIB_DIRS = -L../lib -L$(libdir)
-@@ -102,6 +105,8 @@
-
- MK_SHARED_LIB = @MK_SHARED_LIB@
-
-+NCURSES_MAJOR = @NCURSES_MAJOR@
-+NCURSES_MINOR = @NCURSES_MINOR@
- REL_VERSION = @cf_cv_rel_version@
- ABI_VERSION = @cf_cv_abi_version@
-
diff --git a/devel/ncurses/patches/patch-al b/devel/ncurses/patches/patch-al
deleted file mode 100644
index 5d9783846fe..00000000000
--- a/devel/ncurses/patches/patch-al
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-al,v 1.3 2000/10/12 14:56:47 jlam Exp $
-
---- panel/Makefile.in.orig Thu Oct 12 04:52:58 2000
-+++ panel/Makefile.in
-@@ -54,6 +54,8 @@
- includedir = @includedir@
- datadir = @datadir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -73,6 +75,7 @@
-
- CCFLAGS = $(CPPFLAGS) $(CFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -80,7 +83,7 @@
-
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
--LINK = $(CC)
-+LINK = $(LIBTOOL) $(CC)
- LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
-
- SHLIB_DIRS = -L../lib -L$(libdir)
-@@ -88,6 +91,8 @@
-
- MK_SHARED_LIB = @MK_SHARED_LIB@
-
-+NCURSES_MAJOR = @NCURSES_MAJOR@
-+NCURSES_MINOR = @NCURSES_MINOR@
- REL_VERSION = @cf_cv_rel_version@
- ABI_VERSION = @cf_cv_abi_version@
-
diff --git a/devel/ncurses/patches/patch-am b/devel/ncurses/patches/patch-am
deleted file mode 100644
index af2908bf4ab..00000000000
--- a/devel/ncurses/patches/patch-am
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-am,v 1.3 2000/10/12 14:56:47 jlam Exp $
-
---- progs/Makefile.in.orig Thu Oct 12 04:52:58 2000
-+++ progs/Makefile.in
-@@ -59,6 +59,8 @@
- includedir = @includedir@
- datadir = @datadir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- transform = @program_transform_name@
-@@ -76,6 +78,7 @@
-
- CCFLAGS = $(CPPFLAGS) $(CFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -84,10 +87,11 @@
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
- LD = @LD@
--LINK = @LINK_PROGS@ $(CC)
-+LINK = @LINK_PROGS@ $(LIBTOOL) $(CC)
- LDFLAGS = @EXTRA_LDFLAGS@ \
- @PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
-
-+LDFLAGS_LIBTOOL = $(LDFLAGS)
- LDFLAGS_NORMAL = $(LDFLAGS)
- LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
- LDFLAGS_PROFILE = $(LDFLAGS) -pg
-@@ -103,7 +107,7 @@
- termsort.c \
- transform.h
-
--PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x
-+PROGS = tic$x toe$x infocmp$x # clear$x tput$x tset$x
-
- TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x
-
-@@ -143,12 +147,12 @@
- echo "#define PROG_INIT \"$(actual_init)\"" >>$@
-
- install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
-- $(INSTALL_PROGRAM) tic$x $(DESTDIR)$(bindir)/$(actual_tic)
-- $(INSTALL_PROGRAM) toe$x $(DESTDIR)$(bindir)/$(actual_toe)
-- $(INSTALL_PROGRAM) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
-- $(INSTALL_PROGRAM) clear$x $(DESTDIR)$(bindir)/$(actual_clear)
-- $(INSTALL_PROGRAM) tput$x $(DESTDIR)$(bindir)/$(actual_tput)
-- $(INSTALL_PROGRAM) tset$x $(DESTDIR)$(bindir)/$(actual_tset)
-+ $(LIBTOOL) $(INSTALL_PROGRAM) tic$x $(DESTDIR)$(bindir)/$(actual_tic)
-+ $(LIBTOOL) $(INSTALL_PROGRAM) toe$x $(DESTDIR)$(bindir)/$(actual_toe)
-+ $(LIBTOOL) $(INSTALL_PROGRAM) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
-+# $(LIBTOOL) $(INSTALL_PROGRAM) clear$x $(DESTDIR)$(bindir)/$(actual_clear)
-+# $(LIBTOOL) $(INSTALL_PROGRAM) tput$x $(DESTDIR)$(bindir)/$(actual_tput)
-+# $(LIBTOOL) $(INSTALL_PROGRAM) tset$x $(DESTDIR)$(bindir)/$(actual_tset)
- @echo "linking $(actual_captoinfo) to $(actual_tic)"
- -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
- (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
-@@ -156,19 +160,19 @@
- -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
- (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap))
- @echo "linking $(actual_reset) to $(actual_tset)"
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-- (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset))
-+# -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-+# (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset))
-
- uninstall.progs:
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_tic)
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_toe)
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_clear)
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_tput)
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_tset)
-+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
-+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_toe)
-+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp)
-+# -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_clear)
-+# -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tput)
-+# -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tset)
- -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
- -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
-- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-+# -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-
- $(DESTDIR)$(bindir) :
- $(srcdir)/../mkinstalldirs $@
diff --git a/devel/ncurses/patches/patch-an b/devel/ncurses/patches/patch-an
deleted file mode 100644
index 0e0f5e4490b..00000000000
--- a/devel/ncurses/patches/patch-an
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/10/12 14:56:48 jlam Exp $
-
---- tack/Makefile.in.orig Thu Oct 12 04:52:59 2000
-+++ tack/Makefile.in
-@@ -28,6 +28,8 @@
- includedir = @includedir@
- datadir = @datadir@
-
-+LIBTOOL = @LIBTOOL@
-+
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -44,6 +46,7 @@
-
- CCFLAGS = $(CPPFLAGS) $(CFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -52,10 +55,11 @@
- CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-
- LD = @LD@
--LINK = @LINK_PROGS@ $(CC)
-+LINK = @LINK_PROGS@ $(LIBTOOL) $(CC)
- LDFLAGS = @EXTRA_LDFLAGS@ \
- @PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@
-
-+LDFLAGS_LIBTOOL = $(LDFLAGS)
- LDFLAGS_NORMAL = $(LDFLAGS)
- LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
- LDFLAGS_PROFILE = $(LDFLAGS) -pg
-@@ -88,11 +92,11 @@
- install.tack: $(PROGS) \
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(mandir)
-- $(INSTALL_PROGRAM) tack$x $(DESTDIR)$(bindir)/tack$x
-+ $(LIBTOOL) $(INSTALL_PROGRAM) tack$x $(DESTDIR)$(bindir)/tack$x
- $(INSTALL_DATA) $(srcdir)/tack.1 $(DESTDIR)$(mandir)/tack.1
-
- uninstall.tack:
-- -@rm -f $(DESTDIR)$(bindir)/tack$x
-+ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/tack$x
- -@rm -f $(DESTDIR)$(mandir)/tack.1
-
- $(DESTDIR)$(bindir) \
diff --git a/devel/ncurses/patches/patch-ao b/devel/ncurses/patches/patch-ao
deleted file mode 100644
index d98b53dda75..00000000000
--- a/devel/ncurses/patches/patch-ao
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/10/12 14:56:48 jlam Exp $
-
---- test/Makefile.in.orig Sat May 27 21:28:39 2000
-+++ test/Makefile.in
-@@ -45,6 +45,8 @@
- libdir = @libdir@
- includedir = @includedir@
-
-+LIBTOOL = @LIBTOOL@
-+
- CC = @CC@
- CPP = @CPP@
-
-@@ -53,6 +55,7 @@
-
- CCFLAGS = $(CPPFLAGS) $(CFLAGS)
-
-+CFLAGS_LIBTOOL = $(CCFLAGS)
- CFLAGS_NORMAL = $(CCFLAGS)
- CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
- CFLAGS_PROFILE = $(CCFLAGS) -pg
-@@ -66,10 +69,11 @@
- MATH_LIB = @MATH_LIB@
-
- LD = @LD@
--LINK = @LINK_TESTS@ $(CC)
-+LINK = @LINK_TESTS@ $(LIBTOOL) $(CC)
-
- LDFLAGS = @LD_MODEL@ @TEST_ARGS@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
-
-+LDFLAGS_LIBTOOL = $(LDFLAGS)
- LDFLAGS_NORMAL = $(LDFLAGS)
- LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@
- LDFLAGS_PROFILE = $(LDFLAGS) -pg
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 10:24:26 +0000