Import of pkgsrc-2014Q1

pkgtools/pkg_select/Makefile

@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2012/09/11 23:19:37 asau Exp $
+# $NetBSD: Makefile,v 1.19 2014/03/03 04:52:49 obache Exp $
 #
 
 DISTNAME=	pkg_select-20090308
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	pkgtools
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/
 
 MAINTAINER=	imil@gcu.info
 COMMENT=	Curses based pkgsrc system browser / manager
+LICENSE=	original-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -20,6 +21,11 @@ EXAMPLEDIR=	${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=	${EXAMPLEDIR}/${PKGBASE}.conf.example	\
 			${PKG_SYSCONFDIR}/${PKGBASE}.conf
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+=	rm:-Wno-traditional
+.endif
+
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	Adjusting path.

pkgtools/pkg_select/distinfo

@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.7 2009/03/08 16:13:24 imil 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) = 3100f625773543e4e93f8fb25d706d95aac3016b
+SHA1 (patch-extern.h) = 541e1234e88c926d1bdf94334862f0f0bc81bb59
+SHA1 (patch-install__many.c) = 44d9dc440500f9b30b777e109a360bcaafc5f1db
+SHA1 (patch-listmgt.c) = b1b2f5898709d52c72c465899f0e8dbf1e27a5c2
+SHA1 (patch-pkgsrc.c) = 655931c4a61657d951cab795b8e878b41a056f7c

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