diff -Nru pkgconf-0.9.12/debian/changelog pkgconf-0.9.12/debian/changelog
--- pkgconf-0.9.12/debian/changelog	2017-03-02 08:42:04.000000000 +0000
+++ pkgconf-0.9.12/debian/changelog	2017-05-13 20:49:30.000000000 +0000
@@ -1,3 +1,9 @@
+pkgconf (0.9.12-6) unstable; urgency=medium
+
+  * Handle --define-variable as pkg-config does (Closes: #862509).
+
+ -- Andrew Shadura <andrewsh@debian.org>  Sat, 13 May 2017 22:43:01 +0200
+
 pkgconf (0.9.12-5) unstable; urgency=medium
 
   * Add previously missing Depends: libdpkg-perl (Closes: #856525).
diff -Nru pkgconf-0.9.12/debian/patches/fix-define-variable.patch pkgconf-0.9.12/debian/patches/fix-define-variable.patch
--- pkgconf-0.9.12/debian/patches/fix-define-variable.patch	1970-01-01 00:00:00.000000000 +0000
+++ pkgconf-0.9.12/debian/patches/fix-define-variable.patch	2017-05-13 20:49:30.000000000 +0000
@@ -0,0 +1,106 @@
+From 1fe91b914cb7981395cd4445a221e2570d248146 Mon Sep 17 00:00:00 2001
+From: Baptiste Daroussin <bapt@FreeBSD.org>
+Date: Tue, 8 Dec 2015 00:02:14 +0100
+Subject: [PATCH] Do not parse the global variables
+
+This fixes an incompatibility with pkg-confing 0.29
+Found by Thomas Klausner <wiz@NetBSD.org> when building gupnp-igd-0.2.3
+with introspection support
+---
+ libpkgconf/libpkgconf.h |  2 +-
+ libpkgconf/pkg.c        |  4 ++--
+ libpkgconf/tuple.c      | 30 +++++++++++++++++++++---------
+ 3 files changed, 24 insertions(+), 12 deletions(-)
+
+--- a/pkg.h
++++ b/pkg.h
+@@ -171,7 +171,7 @@
+ char *pkg_fgetline(char *line, size_t size, FILE *stream);
+ 
+ /* tuple.c */
+-pkg_tuple_t *pkg_tuple_add(pkg_list_t *parent, const char *key, const char *value);
++pkg_tuple_t *pkg_tuple_add(pkg_list_t *parent, const char *key, const char *value, bool parse);
+ char *pkg_tuple_find(pkg_list_t *list, const char *key);
+ char *pkg_tuple_parse(pkg_list_t *list, const char *value);
+ void pkg_tuple_free(pkg_list_t *list);
+--- a/pkg.c
++++ b/pkg.c
+@@ -200,7 +200,7 @@
+ 
+ 	pkg = calloc(sizeof(pkg_t), 1);
+ 	pkg->filename = strdup(filename);
+-	pkg_tuple_add(&pkg->vars, "pcfiledir", pkg_get_parent_dir(pkg));
++	pkg_tuple_add(&pkg->vars, "pcfiledir", pkg_get_parent_dir(pkg), true);
+ 
+ 	/* make module id */
+ 	if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL)
+@@ -265,7 +265,7 @@
+ 				pkg_dependency_parse(pkg, &pkg->conflicts, value);
+ 			break;
+ 		case '=':
+-			pkg_tuple_add(&pkg->vars, key, value);
++			pkg_tuple_add(&pkg->vars, key, value, true);
+ 			break;
+ 		default:
+ 			break;
+--- a/tuple.c
++++ b/tuple.c
+@@ -21,7 +21,7 @@
+ void
+ pkg_tuple_add_global(const char *key, const char *value)
+ {
+-	pkg_tuple_add(&pkg_global_var, key, value);
++	pkg_tuple_add(&pkg_global_var, key, value, false);
+ }
+ 
+ char *
+@@ -63,12 +63,15 @@
+ }
+ 
+ pkg_tuple_t *
+-pkg_tuple_add(pkg_list_t *list, const char *key, const char *value)
++pkg_tuple_add(pkg_list_t *list, const char *key, const char *value, bool parse)
+ {
+ 	pkg_tuple_t *tuple = calloc(sizeof(pkg_tuple_t), 1);
+ 
+ 	tuple->key = strdup(key);
+-	tuple->value = pkg_tuple_parse(list, value);
++	if (parse)
++		tuple->value = pkg_tuple_parse(list, value);
++	else
++		tuple->value = strdup(value);
+ 
+ 	pkg_node_insert(&tuple->iter, tuple, list);
+ 
+@@ -127,16 +130,25 @@
+ 			}
+ 
+ 			ptr += (pptr - ptr);
+-			kv = pkg_tuple_find(vars, varname);
+-
++			kv = pkg_tuple_find_global(varname);
+ 			if (kv != NULL)
+ 			{
+-				parsekv = pkg_tuple_parse(vars, kv);
++				strncpy(bptr, kv, PKG_BUFSIZE - (bptr - buf));
++				bptr += strlen(kv);
++			}
++			else
++			{
++				kv = pkg_tuple_find(vars, varname);
+ 
+-				strncpy(bptr, parsekv, PKG_BUFSIZE - (bptr - buf));
+-				bptr += strlen(parsekv);
++				if (kv != NULL)
++				{
++					parsekv = pkg_tuple_parse(vars, kv);
++
++					strncpy(bptr, parsekv, PKG_BUFSIZE - (bptr - buf));
++					bptr += strlen(parsekv);
+ 
+-				free(parsekv);
++					free(parsekv);
++				}
+ 			}
+ 		}
+ 	}
diff -Nru pkgconf-0.9.12/debian/patches/series pkgconf-0.9.12/debian/patches/series
--- pkgconf-0.9.12/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ pkgconf-0.9.12/debian/patches/series	2017-05-13 20:49:30.000000000 +0000
@@ -0,0 +1 @@
+fix-define-variable.patch