--- a/components/desktop/pidgin/Makefile	Fri May 06 09:33:24 2016 -0700
+++ b/components/desktop/pidgin/Makefile	Thu May 05 18:31:35 2016 -0700
@@ -64,7 +64,10 @@
 # Needed to get libpurple to link properly.
 LIBS += -lresolv
 CONFIGURE_ENV +=	LIBS="$(LIBS)"
-CONFIGURE_ENV +=	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH.64)/gnutls-3
+
+# Look for gnutls-3 pkg-config & libraries before the defaults
+PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
+LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
 
 CONFIGURE_ENV += "ac_cv_path_perlpath=$(PERL)"
 

--- a/components/emacs/Makefile	Fri May 06 09:33:24 2016 -0700
+++ b/components/emacs/Makefile	Thu May 05 18:31:35 2016 -0700
@@ -72,7 +72,8 @@
 
 # The configure script runs the pkg-config command. This allows it to
 # find the non-default GnuTLS v3 library.
-CONFIGURE_ENV +=	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH.64)/gnutls-3
+PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
+LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
 
 # Never use xmkmf to find X11 libraries from autoconf. They are all available
 # from standard system locations, and we don't want the ld -L option that

--- a/components/lftp/Makefile	Fri May 06 09:33:24 2016 -0700
+++ b/components/lftp/Makefile	Thu May 05 18:31:35 2016 -0700
@@ -40,7 +40,10 @@
 
 PATCH_LEVEL =   0
 
-CONFIGURE_ENV	+=	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH.64)/gnutls-3
+# Look for gnutls-3 pkg-config & libraries before the defaults
+PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
+LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
+
 CONFIGURE_OPTIONS  +=		--localedir=$(CONFIGURE_LOCALEDIR)
 
 REQUIRED_PACKAGES += library/expat

--- a/components/wireshark/Makefile	Fri May 06 09:33:24 2016 -0700
+++ b/components/wireshark/Makefile	Thu May 05 18:31:35 2016 -0700
@@ -54,6 +54,10 @@
 # We don't have automake 1.14 yet. Thus need to reconfigure with older one.
 COMPONENT_PREP_ACTION += ( cd $(@D) ; $(CONFIG_SHELL) autogen.sh );
 
+# Look for gnutls-3 pkg-config & libraries before the defaults
+PKG_CONFIG_PATH.64 := $(PKG_CONFIG_PATH.64)/gnutls-3:$(PKG_CONFIG_PATH.64)
+LDFLAGS += -L$(USRLIBDIR64)/gnutls-3
+
 CONFIGURE_BINDIR.64= $(CONFIGURE_SBINDIR.64)
 
 CONFIGURE_OPTIONS +=	--disable-usr-local
@@ -63,8 +67,8 @@
 CONFIGURE_OPTIONS +=	--with-krb5
 CONFIGURE_OPTIONS +=	--with-qt=no
 CONFIGURE_OPTIONS +=	--with-gtk2=yes
-CONFIGURE_OPTIONS +=	PATH="$(USRDIR)/perl5/bin:$(GNUBIN):$(PATH)"
-CONFIGURE_OPTIONS +=	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH.64)/gnutls-3
+CONFIGURE_OPTIONS +=	\
+  PATH="$(USRDIR)/perl5/bin:$(GNUBIN)/$(MACH64):$(GNUBIN):$(USRBIN.64):$(PATH)"
 
 # We need to avoid RPATH=/usr/lib in Wireshark libraries so that we can
 # create successfully IPS package of different Wireshark branch than is