diff options
| author | hauke <hauke@pkgsrc.org> | 2010-12-10 07:45:56 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2010-12-10 07:45:56 +0000 |
| commit | 64be1cde2970048d58eec2497285dc1bfeeb1dde (patch) | |
| tree | 7af91984c2afd189eb47d452b1bed1001bc864ce /devel | |
| parent | 707ecee7f2098fb1be681582134e84792f956738 (diff) | |
| download | pkgsrc-64be1cde2970048d58eec2497285dc1bfeeb1dde.tar.gz | |
Squash a C++ism: Variable declarations only at the beginning of a block.
Found while building on NetBSD 1.5.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pkg-config/distinfo | 4 | ||||
| -rw-r--r-- | devel/pkg-config/patches/patch-ah | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index f5d3aebf1a6..91c7fb8e882 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.17 2010/09/28 04:52:41 dsainty Exp $ +$NetBSD: distinfo,v 1.18 2010/12/10 07:45:56 hauke Exp $ SHA1 (pkg-config-0.25.tar.gz) = 8922aeb4edeff7ed554cc1969cbb4ad5a4e6b26e RMD160 (pkg-config-0.25.tar.gz) = 835509d01f68c45823ee89c718776eb66f61316b Size (pkg-config-0.25.tar.gz) = 988899 bytes SHA1 (patch-ac) = 567c7c7dba33253263de81818178d7cebcce8645 SHA1 (patch-ad) = a9c162409c2bbb4e016855ddc691e03d7a3197cb -SHA1 (patch-ah) = 2a19dc53da8c0c611bf47f410862f7d30a06a344 +SHA1 (patch-ah) = 915474d8d93a0f2f17cd352b16bb135379a8c844 SHA1 (patch-ca) = ab435d31c97a487baab8d82638b9d36ec520cf58 SHA1 (patch-cb) = 23412858615649c8d8305ce4e6571f06e17073fd diff --git a/devel/pkg-config/patches/patch-ah b/devel/pkg-config/patches/patch-ah index fa80b7c2767..0c27f67538e 100644 --- a/devel/pkg-config/patches/patch-ah +++ b/devel/pkg-config/patches/patch-ah @@ -1,11 +1,20 @@ -$NetBSD: patch-ah,v 1.4 2010/09/23 07:07:47 adam Exp $ - -Don't call gnome-config, it has been dead for ages and the warnings -just confuse users. +$NetBSD: patch-ah,v 1.5 2010/12/10 07:45:56 hauke Exp $ --- parse.c.orig 2010-05-27 20:21:36.000000000 +0000 +++ parse.c -@@ -1460,102 +1460,8 @@ get_compat_package (const char *name) +@@ -880,8 +880,10 @@ parse_cflags (Package *pkg, const char * + pkg->other_cflags = g_slist_prepend (pkg->other_cflags, + g_strdup (arg)); + if (strcmp("-idirafter", arg) == 0) { ++ char *n; ++ + tmp = trim_string(argv[++i]); +- char *n = strdup_escape_shell(tmp); ++ n = strdup_escape_shell(tmp); + pkg->other_cflags = g_slist_prepend(pkg->other_cflags, n); + g_free(tmp); + } +@@ -1460,102 +1462,8 @@ get_compat_package (const char *name) } else { |