CVS commit: pkgsrc/devel/ncurses

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar  5 12:52:33 UTC 2020

Modified Files:
        pkgsrc/devel/ncurses: Makefile distinfo
        pkgsrc/devel/ncurses/patches: patch-c++_Makefile.in
Added Files:
        pkgsrc/devel/ncurses/patches: patch-configure patch-mk-1st.awk
Removed Files:
        pkgsrc/devel/ncurses/patches: patch-aa patch-ab patch-ac
            patch-aclocal.m4 patch-configure.in

Log Message:
ncurses: clean up patches

Remove cargo-cult packages, only keep the ones for renaming the
form/menu/panel libraries to gnu*.
Handle (removing) terminfo symlink in Makefile instead of as a patch.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r1.19 -r0 pkgsrc/devel/ncurses/patches/patch-aa
cvs rdiff -u -r1.21 -r0 pkgsrc/devel/ncurses/patches/patch-ab
cvs rdiff -u -r1.26 -r0 pkgsrc/devel/ncurses/patches/patch-ac
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ncurses/patches/patch-aclocal.m4 \
    pkgsrc/devel/ncurses/patches/patch-configure.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ncurses/patches/patch-configure \
    pkgsrc/devel/ncurses/patches/patch-mk-1st.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.105 pkgsrc/devel/ncurses/Makefile:1.106
--- pkgsrc/devel/ncurses/Makefile:1.105 Wed Mar  4 14:04:22 2020
+++ pkgsrc/devel/ncurses/Makefile       Thu Mar  5 12:52:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2020/03/04 14:04:22 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2020/03/05 12:52:32 wiz Exp $
 
 .include "Makefile.common"
 
@@ -22,5 +22,6 @@ post-install:
                ${DESTDIR}${PREFIX}/share/examples/ncurses++demo.cc
        ${FIND} ${DESTDIR}${PREFIX}/${TERMINFODIR} -type f -print | ${SORT} | \
        ${SED} -e "s,^${DESTDIR}${PREFIX}/,," >${WRKDIR}/PLIST.terminfo
+       ${RM} ${DESTDIR}${PREFIX}/lib/terminfo
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.39 pkgsrc/devel/ncurses/distinfo:1.40
--- pkgsrc/devel/ncurses/distinfo:1.39  Wed Mar  4 22:25:13 2020
+++ pkgsrc/devel/ncurses/distinfo       Thu Mar  5 12:52:32 2020
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.39 2020/03/04 22:25:13 wiz Exp $
+$NetBSD: distinfo,v 1.40 2020/03/05 12:52:32 wiz Exp $
 
 SHA1 (ncurses-6.2.tar.gz) = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
 RMD160 (ncurses-6.2.tar.gz) = bedfe81f33b3e55e44d14126c9c2821d7f222701
 SHA512 (ncurses-6.2.tar.gz) = 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
 Size (ncurses-6.2.tar.gz) = 3425862 bytes
-SHA1 (patch-aa) = 4523f87f39d2aa3eea07a0e55595eb9e50b74a6c
-SHA1 (patch-ab) = f4573e7a161c2f59d9828d163abe2a5ba2e4d56f
-SHA1 (patch-ac) = 08e5fa8179c7f5c65c617a55c9693745b89b42de
-SHA1 (patch-aclocal.m4) = efb1a966687d2c35fc3e3e1d5345e80aaf2822f6
-SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5
-SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa
+SHA1 (patch-c++_Makefile.in) = f4ee10915ea7ba246151a49f3980d840089967ca
+SHA1 (patch-configure) = 62890a209a780ef4452fd081facc07f0e5090cc0
+SHA1 (patch-mk-1st.awk) = e6b869fffe1f594ee63eee3796dcc623e3eea55c

Index: pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in
diff -u pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in:1.2 pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in:1.3
--- pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in:1.2      Mon Apr  2 16:26:03 2018
+++ pkgsrc/devel/ncurses/patches/patch-c++_Makefile.in  Thu Mar  5 12:52:33 2020
@@ -1,17 +1,10 @@
-$NetBSD: patch-c++_Makefile.in,v 1.2 2018/04/02 16:26:03 spz Exp $
+$NetBSD: patch-c++_Makefile.in,v 1.3 2020/03/05 12:52:33 wiz Exp $
 
---- ./c++/Makefile.in.orig     2016-05-21 23:26:12.000000000 +0000
-+++ ./c++/Makefile.in
-@@ -84,7 +84,7 @@ RANLIB               = @LIB_PREP@
- CXX           = @CXX@
- CPP           = @CXXCPP@
- CXXFLAGS      = @CXXFLAGS@ @EXTRA_CXXFLAGS@
--CXXLIBS               = @CXXLIBS@
-+CXXLIBS               =
- 
- INCDIR                = ../include
- CPPFLAGS      = -DHAVE_CONFIG_H -I../c++ @CPPFLAGS@
-@@ -112,7 +112,7 @@ LOCAL_LIBDIR       = @top_builddir@/lib
+Rename form/menu/panel to gnu*.
+
+--- c++/Makefile.in.orig       2020-02-02 23:34:34.000000000 +0000
++++ c++/Makefile.in
+@@ -114,7 +114,7 @@ LOCAL_LIBDIR       = @top_builddir@/lib
  
  LINK          = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
  SHLIB_DIRS    = -L../lib

Added files:

Index: pkgsrc/devel/ncurses/patches/patch-configure
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-configure:1.1
--- /dev/null   Thu Mar  5 12:52:33 2020
+++ pkgsrc/devel/ncurses/patches/patch-configure        Thu Mar  5 12:52:33 2020
@@ -0,0 +1,71 @@
+$NetBSD: patch-configure,v 1.1 2020/03/05 12:52:33 wiz Exp $
+
+Make Debian behave like all other operating systems.
+
+Rename form/menu/panel to gnu*.
+
+--- configure.orig     2020-02-08 21:06:19.000000000 +0000
++++ configure
+@@ -13816,11 +13816,7 @@ case ".$MANPAGE_RENAMES" in
+       ;;
+ (.|.yes)
+       # Debian 'man' program?
+-      if test -f /etc/debian_version ; then
+-              MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
+-      else
+-              MANPAGE_RENAMES=no
+-      fi
++      MANPAGE_RENAMES=no
+       ;;
+ esac
+ 
+@@ -25656,8 +25652,17 @@ EOF
+ #define HAVE_LIB${cf_have_include} 1
+ EOF
+ 
+-                      TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
+-                      TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2"
++                      case ${cf_dir} in
++                      form|menu|panel)
++                              TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}gnu${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
++                              TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}gnu${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2"
++                              ;;
++                      *)
++                              TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS"
++                              TEST_DEP2="${LIB_2ND}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEP2"
++                              ;;
++                      esac
++
+                       if test "$DFT_LWR_MODEL" = "libtool"; then
+                               TEST_ARGS="${TEST_DEPS}"
+                               TEST_ARG2="${TEST_DEP2}"
+@@ -25914,9 +25919,9 @@ fi
+ ADAHTML_DIR=../../doc/html/ada
+ 
+ # these could be configurable, but are not currently
+-PANEL_NAME=panel
+-MENU_NAME=menu
+-FORM_NAME=form
++PANEL_NAME=gnupanel
++MENU_NAME=gnumenu
++FORM_NAME=gnuform
+ CXX_NAME=ncurses++
+ 
+ # workaround for OS/2 (20151017)
+@@ -27440,7 +27445,15 @@ CF_EOF
+               cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}"
+       fi
+ 
+-                      cf_libname=$cf_dir
++                      case $cf_dir in
++                      form|menu|panel)
++                              cf_libname=gnu$cf_dir
++                              ;;
++                      *)
++                              cf_libname=$cf_dir
++                              ;;
++                      esac
++
+                       test "$cf_dir" = c++ && cf_libname=ncurses++
+                       if test $cf_item = shared ; then
+                               if test -n "${LIB_SUFFIX}"
Index: pkgsrc/devel/ncurses/patches/patch-mk-1st.awk
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-mk-1st.awk:1.1
--- /dev/null   Thu Mar  5 12:52:33 2020
+++ pkgsrc/devel/ncurses/patches/patch-mk-1st.awk       Thu Mar  5 12:52:33 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-mk-1st.awk,v 1.1 2020/03/05 12:52:33 wiz Exp $
+
+Rename form/menu/panel to gnu*.
+
+--- mk-1st.awk.orig    2020-02-02 23:34:34.000000000 +0000
++++ mk-1st.awk
+@@ -69,6 +69,9 @@ function is_termlib() {
+       }
+ # see lib_name
+ function lib_name_of(a_name) {
++      if (a_name == "form" || a_name == "panel" || a_name == "menu" || a_name == "formw" || a_name == "panelw" || a_name == "menuw")
++              return sprintf("%sgnu%s%s", prefix, a_name, suffix)
++      else
+               return sprintf("%s%s%s", prefix, a_name, suffix)
+       }
+ # see imp_name