summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2013-04-23 11:36:29 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2013-04-23 11:36:29 +0000
commit0f3d0b5eb8897f1c27b64a652519e71abd896216 (patch)
treea568a596e673d53694b49b756117875553e79463
parent- Make it build on FreeBSD 10 (diff)
pkgconf update wasn't support to be updated previously, however it is just the
same version as 0.9.1 with our patches included. Remove the now unnecessary patches.
Notes
Notes: svn path=/head/; revision=316349
-rw-r--r--devel/pkgconf/files/patch-pkg.c11
-rw-r--r--devel/pkgconf/files/patch-pkg.c-222
2 files changed, 0 insertions, 33 deletions
diff --git a/devel/pkgconf/files/patch-pkg.c b/devel/pkgconf/files/patch-pkg.c
deleted file mode 100644
index 7b6744d01aaa..000000000000
--- a/devel/pkgconf/files/patch-pkg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pkg.c.orig 2013-03-16 02:19:13.000000000 +0100
-+++ ./pkg.c 2013-03-17 23:47:38.808630318 +0100
-@@ -890,7 +890,7 @@
- }
-
- pkgdep->flags |= PKG_PROPF_SEEN;
-- eflags = pkg_traverse(pkgdep, func, data, depth - 1, flags);
-+ eflags |= pkg_traverse(pkgdep, func, data, depth - 1, flags);
- pkgdep->flags &= ~PKG_PROPF_SEEN;
- pkg_unref(pkgdep);
- }
diff --git a/devel/pkgconf/files/patch-pkg.c-2 b/devel/pkgconf/files/patch-pkg.c-2
deleted file mode 100644
index f376468716da..000000000000
--- a/devel/pkgconf/files/patch-pkg.c-2
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git pkg.c pkg.c
-index ed23b47..58eed08 100644
---- pkg.c
-+++ pkg.c
-@@ -461,6 +461,8 @@ pkg_find(const char *name, unsigned int flags)
- pkg_node_t *n;
- FILE *f;
-
-+ pkg_dir_list_build(flags);
-+
- /* name might actually be a filename. */
- if (str_has_suffix(name, PKG_CONFIG_EXT))
- {
-@@ -485,8 +487,6 @@ pkg_find(const char *name, unsigned int flags)
- }
- }
-
-- pkg_dir_list_build(flags);
--
- PKG_FOREACH_LIST_ENTRY(pkg_dir_list.head, n)
- {
- pkg_path_t *pkg_path = n->data;