diff options
author | bapt <bapt@FreeBSD.org> | 2013-04-23 19:36:29 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2013-04-23 19:36:29 +0800 |
commit | 48d9486ae5b31541db4efd4cf3d0639b579fa32a (patch) | |
tree | a568a596e673d53694b49b756117875553e79463 /devel | |
parent | 093bd4dfbe5d4cc5ae05a5d04ab535b183f981b5 (diff) | |
download | freebsd-ports-gnome-48d9486ae5b31541db4efd4cf3d0639b579fa32a.tar.gz freebsd-ports-gnome-48d9486ae5b31541db4efd4cf3d0639b579fa32a.tar.zst freebsd-ports-gnome-48d9486ae5b31541db4efd4cf3d0639b579fa32a.zip |
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.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/pkgconf/files/patch-pkg.c | 11 | ||||
-rw-r--r-- | devel/pkgconf/files/patch-pkg.c-2 | 22 |
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; |