Import of pkgsrc-2014Q1

pkgtools/pkg_select/patches/patch-curses__helpers.c

@@ -0,0 +1,38 @@
+$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
+@@ -458,7 +458,7 @@ combo_entry(WINDOW *list_win, Etree *ite
+ 		snprintf(buf, MAXLEN, "[ %-15s%c%c]", tmp_entry, tbi, status);
+ 		entry_size = strlen(buf);
+ 		wattron(list_win, A_BOLD);
+-		wprintw(list_win, buf);
++		wprintw(list_win, "%s", buf);
+ 		wattroff(list_win, A_BOLD);
+ 	}
+ 	/* then comment | item list */
+@@ -653,11 +653,11 @@ progress_bar(const char **keylist, char 
+ 	for (i = 0; i < pg; i++) {
+ 		/* clear line */
+ 		line_padding(buf, ' ', w);
+-		mvwprintw(popup, 1, 2, buf);
++		mvwprintw(popup, 1, 2, "%s", buf);
+ 		trimcr(key);
+ 		cut_str(key, w - 3);
+ 		line_padding(key, ' ', w);
+-		mvwprintw(popup, 1, 2, key);
++		mvwprintw(popup, 1, 2, "%s", key);
+ 		wattron(popup, A_REVERSE);
+ 		mvwprintw(popup, 3, i + 2, " ");
+ 		wattroff(popup, A_REVERSE);
+@@ -698,7 +698,7 @@ cmd_spawn(int waitkey, const char **prog
+ 	while (fgets(buf, MAXLEN, fp) != NULL) {
+ 		/* shell output preferred instead of progress bars */
+ 		if (conf.shell_output)
+-			printf(buf);
++			printf("%s", buf);
+ 		else
+ 			if (next)
+ 				next = progress_bar(progress_list, 

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);

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);

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;

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);
+ 	}