Index: head/net-mgmt/collectd5/files/patch-configure.ac
===================================================================
--- head/net-mgmt/collectd5/files/patch-configure.ac	(revision 364304)
+++ head/net-mgmt/collectd5/files/patch-configure.ac	(revision 364305)
@@ -1,68 +1,59 @@
 --- configure.ac.orig	2013-08-18 04:24:25.049973000 -0600
 +++ configure.ac	2013-08-19 10:46:53.000000000 -0600
 @@ -110,7 +110,7 @@
  fi
  
  # Where to install .pc files.
 -pkgconfigdir="${libdir}/pkgconfig"
 +pkgconfigdir="${prefix}/libdata/pkgconfig"
  AC_SUBST(pkgconfigdir)
  
  # Check for standards compliance mode
 @@ -1419,6 +1419,7 @@
  then
  	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
  fi
 +
  if test "x$with_kstat" = "xyes"
  then
  	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
 @@ -1428,6 +1429,8 @@
  then
  	AC_DEFINE(HAVE_LIBKSTAT, 1,
  		  [Define to 1 if you have the 'kstat' library (-lkstat)])
 +	BUILD_WITH_LIBKSTAT_LIBS="-lkstat"
 +	AC_SUBST(BUILD_WITH_LIBKSTAT_LIBS)
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
  AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
 @@ -1904,12 +1907,6 @@
  	AC_CHECK_LIB(gcrypt, gcry_md_hash_buffer,
  		[with_libgcrypt="yes"],
  		[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
 -
 -	if test "$with_libgcrypt" != "no"; then
 -		AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
 -		GCRYPT_CPPFLAGS="$LIBGCRYPT_CPPFLAGS $LIBGCRYPT_CFLAGS"
 -		GCRYPT_LIBS="$LIBGCRYPT_LIBS"
 -	fi
  fi
  
  CPPFLAGS="$SAVE_CPPFLAGS"
-@@ -3454,7 +3451,7 @@
- if test "x$with_python" = "xyes"
- then
- 	AC_MSG_CHECKING([for Python LIBS])
--	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
-+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1`
- 	python_config_status=$?
- 
- 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
 @@ -3469,7 +3466,7 @@
  if test "x$with_python" = "xyes"
  then
  	LDFLAGS="-L$python_library_path $LDFLAGS"
 -	LIBS="$python_library_flags $LIBS"
 +	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
  
  	AC_CHECK_FUNC(PyObject_CallFunction,
  		      [with_python="yes"],
 @@ -4339,7 +4336,7 @@
  	then
  		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
  		with_libvarnish_cflags="-I$withval/include"
 -		with_libvarnish_libs="-L$withval/lib -lvarnishapi"
 +		with_libvarnish_libs="-L$withval/lib/varnish -lvarnishapi"
  		with_libvarnish="yes"
  	fi; fi; fi
  ],