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.

9 files changed, 39 insertions, 181 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 29c87dc12ac..5e64a87382d 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -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"
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 4d6c54810a3..431b4cb129d 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -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
diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa
deleted file mode 100644
index 18326423933..00000000000
--- a/devel/ncurses/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.19 2018/04/02 16:26:03 spz Exp $
-
---- ./misc/run_tic.in.orig	2017-10-24 00:16:22.000000000 +0000
-+++ ./misc/run_tic.in
-@@ -124,13 +124,13 @@ fi
- # would generate a lot of confusing error messages if we tried to overwrite it.
- # We explicitly remove its contents rather than the directory itself, in case
- # the directory is actually a symbolic link.
--if test -d "$TERMINFO"
--then
--	( cd "$TERMINFO" && rm -fr ? 2>/dev/null )
--elif test -f "$TERMINFO.db"
--then
--	( rm -f "$TERMINFO.db" 2>/dev/null )
--fi
-+#if test -d "$TERMINFO"
-+#then
-+#	( cd "$TERMINFO" && rm -fr ? 2>/dev/null )
-+#elif test -f "$TERMINFO.db"
-+#then
-+#	( rm -f "$TERMINFO.db" 2>/dev/null )
-+#fi
- 
- if test "$ext_funcs" = 1 ; then
- cat <<EOF
-@@ -172,6 +172,9 @@ else
- fi
- 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
deleted file mode 100644
index afede281f4b..00000000000
--- a/devel/ncurses/patches/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ab,v 1.21 2018/04/02 16:26:03 spz Exp $
-
---- ./mk-1st.awk.orig	2017-12-02 23:29:29.000000000 +0000
-+++ ./mk-1st.awk
-@@ -67,6 +67,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
-@@ -471,7 +474,7 @@ END	{
- 				printf "\t$(RANLIB) $@\n"
- 				if ( host == "vxworks" )
- 				{
--					printf "\t$(LD) $(LD_OPTS) $? -o $(@:.a=$o)\n"
-+					printf "\t$(LD) $(LD_OPTS) $? -o $(@:.a=.o)\n"
- 				}
- 				print  ""
- 				print  "install \\"
-@@ -517,7 +520,7 @@ END	{
- 			print "mostlyclean::"
- 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
- 			if ( MODEL == "LIBTOOL" ) {
--				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
-+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
- 			}
- 		}
- 		else if ( found == 2 )
-@@ -526,13 +529,13 @@ END	{
- 			print "mostlyclean::"
- 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
- 			if ( MODEL == "LIBTOOL" ) {
--				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
-+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
- 			}
- 			print ""
- 			print "clean ::"
- 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
- 			if ( MODEL == "LIBTOOL" ) {
--				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
-+				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
- 			}
- 		}
- 	}
diff --git a/devel/ncurses/patches/patch-aclocal.m4 b/devel/ncurses/patches/patch-aclocal.m4
deleted file mode 100644
index b54c4c6208a..00000000000
--- a/devel/ncurses/patches/patch-aclocal.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aclocal.m4,v 1.1 2016/12/18 23:30:34 joerg Exp $
-
---- aclocal.m4.orig	2015-08-06 00:46:34.000000000 +0000
-+++ aclocal.m4
-@@ -3309,7 +3309,15 @@ CF_EOF
- 		for cf_item in $cf_LIST_MODELS
- 		do
- 			CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
--			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}"
-@@ -4250,11 +4258,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
- 
-@@ -6174,8 +6178,16 @@ do
- 			CF_UPPER(cf_have_include,$cf_dir)
- 			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_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}"
diff --git a/devel/ncurses/patches/patch-c++_Makefile.in b/devel/ncurses/patches/patch-c++_Makefile.in
index 90045e2d012..b4ffde736e4 100644
--- a/devel/ncurses/patches/patch-c++_Makefile.in
+++ b/devel/ncurses/patches/patch-c++_Makefile.in
@@ -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
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-configure
index 2294f98b394..e2428ec885a 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-configure
@@ -1,8 +1,12 @@
-$NetBSD: patch-ac,v 1.26 2018/04/02 16:26:03 spz Exp $
+$NetBSD: patch-configure,v 1.1 2020/03/05 12:52:33 wiz Exp $
 
---- ./configure.orig	2018-01-20 00:27:18.000000000 +0000
-+++ ./configure
-@@ -11770,11 +11770,7 @@ case ".$MANPAGE_RENAMES" in
+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?
@@ -15,7 +19,7 @@ $NetBSD: patch-ac,v 1.26 2018/04/02 16:26:03 spz Exp $
  	;;
  esac
  
-@@ -23263,8 +23259,17 @@ EOF
+@@ -25656,8 +25652,17 @@ EOF
  #define HAVE_LIB${cf_have_include} 1
  EOF
  
@@ -35,7 +39,7 @@ $NetBSD: patch-ac,v 1.26 2018/04/02 16:26:03 spz Exp $
  			if test "$DFT_LWR_MODEL" = "libtool"; then
  				TEST_ARGS="${TEST_DEPS}"
  				TEST_ARG2="${TEST_DEP2}"
-@@ -23567,9 +23572,9 @@ fi
+@@ -25914,9 +25919,9 @@ fi
  ADAHTML_DIR=../../doc/html/ada
  
  # these could be configurable, but are not currently
@@ -48,7 +52,7 @@ $NetBSD: patch-ac,v 1.26 2018/04/02 16:26:03 spz Exp $
  CXX_NAME=ncurses++
  
  # workaround for OS/2 (20151017)
-@@ -25011,7 +25016,15 @@ CF_EOF
+@@ -27440,7 +27445,15 @@ CF_EOF
  		cf_depsuf="${LIB_SUFFIX}${EXTRA_SUFFIX}${cf_depsuf}"
  	fi
  
diff --git a/devel/ncurses/patches/patch-configure.in b/devel/ncurses/patches/patch-configure.in
deleted file mode 100644
index 3d5ee6d68f2..00000000000
--- a/devel/ncurses/patches/patch-configure.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-configure.in,v 1.1 2016/12/18 23:30:34 joerg Exp $
-
---- configure.in.orig	2016-03-24 16:40:57.606323008 +0000
-+++ configure.in
-@@ -2065,9 +2065,9 @@ ADAHTML_DIR=../../doc/html/ada
- AC_SUBST(ADAHTML_DIR)
- 
- # 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++
- 
- AC_SUBST(PANEL_NAME)
diff --git a/devel/ncurses/patches/patch-mk-1st.awk b/devel/ncurses/patches/patch-mk-1st.awk
new file mode 100644
index 00000000000..bc3a9c1cc21
--- /dev/null
+++ b/devel/ncurses/patches/patch-mk-1st.awk
@@ -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