Fix const correctness issue that has been intermittently causing build

failures for a long time.  (I'm not sure why it sometimes does and
sometimes doesn't, but I think it may depend on different CFLAGS
arising from bootstrapping vs. not bootstrapping.)

While here add a comment to patch-curses__helpers.c; hi Joerg.

6 files changed, 78 insertions, 3 deletions

diff --git a/pkgtools/pkg_select/distinfo b/pkgtools/pkg_select/distinfo
index c3b72a45d60..b4f426335a3 100644
--- a/pkgtools/pkg_select/distinfo
+++ b/pkgtools/pkg_select/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.8 2013/09/10 14:39:54 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/11/29 23:13:56 dholland Exp $
 
 SHA1 (pkg_select-20090308.tar.gz) = f4a4f40927631d16ee563671ce98e69843382c93
 RMD160 (pkg_select-20090308.tar.gz) = d265f8e18ee4500e2ac34ba2d105acff28cc7e91
 Size (pkg_select-20090308.tar.gz) = 54637 bytes
-SHA1 (patch-curses__helpers.c) = fb2198e1c5d362a22cbd6cced9b28ac330daddfe
+SHA1 (patch-curses__helpers.c) = 3100f625773543e4e93f8fb25d706d95aac3016b
+SHA1 (patch-extern.h) = 541e1234e88c926d1bdf94334862f0f0bc81bb59
+SHA1 (patch-install__many.c) = 44d9dc440500f9b30b777e109a360bcaafc5f1db
+SHA1 (patch-listmgt.c) = b1b2f5898709d52c72c465899f0e8dbf1e27a5c2
+SHA1 (patch-pkgsrc.c) = 655931c4a61657d951cab795b8e878b41a056f7c
diff --git a/pkgtools/pkg_select/patches/patch-curses__helpers.c b/pkgtools/pkg_select/patches/patch-curses__helpers.c
index 9b140f504ce..df4b5a35459 100644
--- a/pkgtools/pkg_select/patches/patch-curses__helpers.c
+++ b/pkgtools/pkg_select/patches/patch-curses__helpers.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-curses__helpers.c,v 1.1 2013/09/10 14:39:54 joerg Exp $
+$NetBSD: patch-curses__helpers.c,v 1.2 2013/11/29 23:13:56 dholland Exp $
+
+Fix printf format strings.
 
 --- curses_helpers.c.orig	2013-09-10 11:42:25.000000000 +0000
 +++ curses_helpers.c
diff --git a/pkgtools/pkg_select/patches/patch-extern.h b/pkgtools/pkg_select/patches/patch-extern.h
new file mode 100644
index 00000000000..b3489c7eb9b
--- /dev/null
+++ b/pkgtools/pkg_select/patches/patch-extern.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-extern.h,v 1.1 2013/11/29 23:13:56 dholland Exp $
+
+Fix const correctness.
+
+--- extern.h~	2009-03-08 14:25:53.000000000 +0000
++++ extern.h
+@@ -50,7 +50,7 @@ extern int entry_search(Etree **, int);
+ /* list mgt */
+ extern int find_value(Etree **, char *);
+ extern char **pkgfind(const char *, const char *, int);
+-extern Etree **build_tree_from_list(const char **);
++extern Etree **build_tree_from_list(const char *const *);
+ 
+ extern int info_win(WINDOW *, char *, char *);
+ extern int more_file(WINDOW *, char *, int, int, int, int);
diff --git a/pkgtools/pkg_select/patches/patch-install__many.c b/pkgtools/pkg_select/patches/patch-install__many.c
new file mode 100644
index 00000000000..8a75c8c1055
--- /dev/null
+++ b/pkgtools/pkg_select/patches/patch-install__many.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-install__many.c,v 1.1 2013/11/29 23:13:56 dholland Exp $
+
+Fix const correctness.
+
+--- install_many.c~	2009-03-08 14:25:53.000000000 +0000
++++ install_many.c
+@@ -199,7 +199,7 @@ process_many(int action)
+ 		if ((list = build_list_from_slist()) == NULL)
+ 			goto out;
+ 		if ((etree = 
+-		     build_tree_from_list((const char **)list)) == NULL)
++		     build_tree_from_list((const char *const *)list)) == NULL)
+ 			goto out;
+ 
+ 		XFREE(resp);
diff --git a/pkgtools/pkg_select/patches/patch-listmgt.c b/pkgtools/pkg_select/patches/patch-listmgt.c
new file mode 100644
index 00000000000..ed29e155886
--- /dev/null
+++ b/pkgtools/pkg_select/patches/patch-listmgt.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-listmgt.c,v 1.1 2013/11/29 23:13:56 dholland Exp $
+
+Fix const correctness.
+
+--- listmgt.c~	2009-03-08 14:25:53.000000000 +0000
++++ listmgt.c
+@@ -90,7 +90,7 @@ entry_search(Etree **etree, int cont)
+ }
+ 
+ Etree **
+-build_tree_from_list(const char **list)
++build_tree_from_list(const char *const *list)
+ {
+ 	int i, count, len;
+ 	char *p;
diff --git a/pkgtools/pkg_select/patches/patch-pkgsrc.c b/pkgtools/pkg_select/patches/patch-pkgsrc.c
new file mode 100644
index 00000000000..79b51c40c7e
--- /dev/null
+++ b/pkgtools/pkg_select/patches/patch-pkgsrc.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-pkgsrc.c,v 1.1 2013/11/29 23:13:56 dholland Exp $
+
+Fix const correctness.
+
+--- pkgsrc.c~	2009-03-08 14:25:53.000000000 +0000
++++ pkgsrc.c
+@@ -80,7 +80,7 @@ list_mirrors(const char *method)
+ 
+ 	if ((list = build_mirror_list(method)) == NULL)
+ 		return(NULL);
+-	if ((etree = build_tree_from_list((const char **)list)) == NULL) {
++	if ((etree = build_tree_from_list((const char *const *)list)) == NULL) {
+ 		free_list(&list);
+ 		return(NULL);
+ 	}
+@@ -247,7 +247,7 @@ get_cvs_branch(const char *anoncvs, int 
+ 	free_list(&list);
+ 	
+ 	if ((etree = 
+-	     build_tree_from_list((const char **)branchlist)) == NULL) {
++	     build_tree_from_list((const char *const *)branchlist)) == NULL) {
+ 		free_list(&branchlist);
+ 		return(NULL);
+ 	}