diff options
| author | joerg <joerg@pkgsrc.org> | 2013-09-10 14:39:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-09-10 14:39:54 +0000 |
| commit | 9e10eb7ef39f7d86b5366a2203ddc73e061bda27 (patch) | |
| tree | b4bcf17d4f8c2e7b766a65d1b716f78c1daf7447 /pkgtools | |
| parent | ec1cd8cc1b6e88bec2cde4aa21561a6ec81aeba9 (diff) | |
| download | pkgsrc-9e10eb7ef39f7d86b5366a2203ddc73e061bda27.tar.gz | |
Don't pass formatted buffers as format strings. Drop -Wno-traditional
for clang. Bump revision.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_select/Makefile | 9 | ||||
| -rw-r--r-- | pkgtools/pkg_select/distinfo | 3 | ||||
| -rw-r--r-- | pkgtools/pkg_select/patches/patch-curses__helpers.c | 36 |
3 files changed, 45 insertions, 3 deletions
diff --git a/pkgtools/pkg_select/Makefile b/pkgtools/pkg_select/Makefile index b752d1f9a93..9428fbc8e70 100644 --- a/pkgtools/pkg_select/Makefile +++ b/pkgtools/pkg_select/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2012/09/11 23:19:37 asau Exp $ +# $NetBSD: Makefile,v 1.18 2013/09/10 14:39:54 joerg Exp $ # DISTNAME= pkg_select-20090308 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= pkgtools MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/ @@ -20,6 +20,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. diff --git a/pkgtools/pkg_select/distinfo b/pkgtools/pkg_select/distinfo index ed769a422e7..c3b72a45d60 100644 --- a/pkgtools/pkg_select/distinfo +++ b/pkgtools/pkg_select/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2009/03/08 16:13:24 imil Exp $ +$NetBSD: distinfo,v 1.8 2013/09/10 14:39:54 joerg 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 diff --git a/pkgtools/pkg_select/patches/patch-curses__helpers.c b/pkgtools/pkg_select/patches/patch-curses__helpers.c new file mode 100644 index 00000000000..9b140f504ce --- /dev/null +++ b/pkgtools/pkg_select/patches/patch-curses__helpers.c @@ -0,0 +1,36 @@ +$NetBSD: patch-curses__helpers.c,v 1.1 2013/09/10 14:39:54 joerg Exp $ + +--- 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, |