[pkgsrc/trunk]: pkgsrc/devel/ncurses Allow ncurses to install useful reset, t...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76ed2ece8bb5
branches:  trunk
changeset: 465066:76ed2ece8bb5
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat Dec 20 08:49:27 2003 +0000

description:
Allow ncurses to install useful reset, tset, tput and clear utilities
(and manpages).  This is in regards to my PR #23103.
I bumped PKGREVISION in Makefile but not in buildlink2.mk file.
The ncurses libraries and headers didn't change. No need to bump
PKGREVISIONs for all the packages that depend on libncurses.

diffstat:

 devel/ncurses/Makefile         |   8 ++------
 devel/ncurses/PLIST            |  10 +++++++++-
 devel/ncurses/distinfo         |   3 +--
 devel/ncurses/patches/patch-ab |  37 -------------------------------------
 4 files changed, 12 insertions(+), 46 deletions(-)

diffs (115 lines):

diff -r 9f0bb9c93f21 -r 76ed2ece8bb5 devel/ncurses/Makefile
--- a/devel/ncurses/Makefile    Sat Dec 20 05:29:55 2003 +0000
+++ b/devel/ncurses/Makefile    Sat Dec 20 08:49:27 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2003/11/23 07:12:01 salo Exp $
+# $NetBSD: Makefile,v 1.53 2003/12/20 08:49:27 reed Exp $
 
 DISTNAME=              ncurses-${NC_VERS}
 NC_VERS=               5.3
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNU:=ncurses/} \
                        ftp://dickey.his.com/ncurses/ \
@@ -45,12 +45,8 @@
 CONFIGURE_ARGS+=       --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR}
 CONFIGURE_ARGS+=       --with-terminfo-dirs=${PREFIX}/${TERMINFODIR}
 
-# Remove these manpages from the distribution so they won't get installed
-CURSES_NO_MAN=         clear.1 tput.1 tset.1
-
 post-configure:
        cd ${WRKSRC}/man;                                       \
-       ${RM} -f ${CURSES_NO_MAN};                              \
        for f in *.1m; do                                       \
                ${MV} -f $${f} `${BASENAME} $${f} .1m`.1;       \
        done;                                                   \
diff -r 9f0bb9c93f21 -r 76ed2ece8bb5 devel/ncurses/PLIST
--- a/devel/ncurses/PLIST       Sat Dec 20 05:29:55 2003 +0000
+++ b/devel/ncurses/PLIST       Sat Dec 20 08:49:27 2003 +0000
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/31 16:20:01 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/20 08:49:27 reed Exp $
 bin/captoinfo
+bin/clear
 bin/infocmp
 bin/infotocap
+bin/reset
 bin/tack
 bin/tic
 bin/toe
+bin/tput
+bin/tset
 include/cursesapp.h
 include/cursesf.h
 include/cursesm.h
@@ -47,11 +51,15 @@
 lib/libpanel.so.5
 lib/libpanel.so.5.3
 man/man1/captoinfo.1
+man/man1/clear.1
 man/man1/infocmp.1
 man/man1/infotocap.1
+man/man1/reset.1
 man/man1/tack.1
 man/man1/tic.1
 man/man1/toe.1
+man/man1/tput.1
+man/man1/tset.1
 man/man3/COLOR_PAIR.3
 man/man3/PAIR_NUMBER.3
 man/man3/_nc_tracebits.3
diff -r 9f0bb9c93f21 -r 76ed2ece8bb5 devel/ncurses/distinfo
--- a/devel/ncurses/distinfo    Sat Dec 20 05:29:55 2003 +0000
+++ b/devel/ncurses/distinfo    Sat Dec 20 08:49:27 2003 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/03/30 20:34:58 jschauma Exp $
+$NetBSD: distinfo,v 1.9 2003/12/20 08:49:27 reed Exp $
 
 SHA1 (ncurses-5.3.tar.gz) = d52cfa70ffe5535c3e3d9185b084ba41445ad102
 Size (ncurses-5.3.tar.gz) = 2067718 bytes
 SHA1 (patch-aa) = 141a7c8cb500f3a12d2d0648ae36ccdb43e0280e
-SHA1 (patch-ab) = 865f991b4499723e14fefb9ba5b829bd5abcfd0d
 SHA1 (patch-ac) = d8a58856cc12b761d6cc21cbacbba9c90af82114
diff -r 9f0bb9c93f21 -r 76ed2ece8bb5 devel/ncurses/patches/patch-ab
--- a/devel/ncurses/patches/patch-ab    Sat Dec 20 05:29:55 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2003/01/21 11:05:19 wiz Exp $
-
---- progs/Makefile.in.orig     Sat Dec  8 19:48:01 2001
-+++ progs/Makefile.in
-@@ -108,7 +108,7 @@ AUTO_SRC = \
-       transform.h
- 
- # tic and toe rely on direct access to the terminfo database
--GET_PROGS = infocmp$x clear$x tput$x tset$x
-+GET_PROGS = infocmp$x # clear$x tput$x tset$x
- PUT_PROGS = @MAKE_TERMINFO@ tic$x toe$x
- PROGS = $(PUT_PROGS) $(GET_PROGS)
- 
-@@ -159,12 +159,6 @@ install.progs: $(AUTO_SRC) $(PROGS) $(DE
- @MAKE_TERMINFO@       -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
- @MAKE_TERMINFO@       (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
-       $(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_reset) to $(actual_tset)"
--      -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
--      (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset))
- 
- uninstall.progs:
- @MAKE_TERMINFO@       -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
-@@ -172,10 +166,6 @@ uninstall.progs:
- @MAKE_TERMINFO@       -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
- @MAKE_TERMINFO@       -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
-       -@$(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_reset)
- 
- $(DESTDIR)$(bindir) :
-       sh $(srcdir)/../mkinstalldirs $@