Index: textproc/libxml2/Makefile
===================================================================
--- textproc/libxml2/Makefile
+++ textproc/libxml2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.9.2
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/ \
@@ -13,6 +13,9 @@
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	XML parser library for GNOME
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/Copyright
+
 .if !defined(REFERENCE_PORT)
 
 GNU_CONFIGURE=	yes
@@ -24,6 +27,9 @@
 		--with-html-subdir=${PORTNAME} \
 		--with-lzma=/usr \
 		--without-python
+CONFIGURE_ARGS+=	THREAD_LIBS=""	# Null out because <insert-reason-here>
+MAKE_ENV+=		V=1		# Verbose build
+
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	*.py */*.py */*/*.py
 
@@ -31,7 +37,7 @@
 
 .if !defined(MASTERDIR)
 
-OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
+OPTIONS_DEFINE=	SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
 OPTIONS_DEFAULT=SCHEMA VALID THREADS
 SCHEMA_DESC=	XML schema support
 SCHEMA_CONFIGURE_WITH=	schemas
@@ -39,11 +45,11 @@
 VALID_CONFIGURE_OFF=	--without-valid
 THREADS_DESC=	Threads support
 THREADS_CONFIGURE_WITH=	threads
-MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
+MEM_DEBUG_DESC=	Memory debugging (DEVELOPERS ONLY!)
 MEM_DEBUG_CONFIGURE_WITH=	mem-debug
-XMLLINT_HIST_DESC= History for xmllint
+XMLLINT_HIST_DESC=	History for xmllint
 XMLLINT_HIST_CONFIGURE_WITH=	history
-THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
+THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
 THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
 
 .endif # !defined(MASTERDIR)
@@ -65,6 +71,9 @@
 	@${RM} -rf ${STAGEDIR}${PREFIX}/share/gtk-doc
 .endif
 
+regression-test: build
+	cd ${WRKSRC} && ${GMAKE} tests
+
 .include <bsd.port.mk>
 
 .endif
Index: textproc/libxml2/files/patch-configure
===================================================================
--- textproc/libxml2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-11-24 09:41:13.000000000 +0100
-+++ configure	2013-11-24 09:41:55.000000000 +0100
-@@ -14499,6 +14499,8 @@
- 	       fi
- 	   fi
-        ;;
-+       *freebsd*) THREAD_LIBS=""
-+       ;;
-     esac
-     if test "$WITH_THREADS" = "1" ; then
- 	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
Index: textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
===================================================================
--- textproc/libxml2/files/patch-libxml-2.0-uninstalled.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libxml-2.0-uninstalled.pc.in.orig	2009-07-30 11:24:34.000000000 -0400
-+++ libxml-2.0-uninstalled.pc.in	2013-04-09 15:37:18.000000000 -0400
-@@ -8,5 +8,5 @@
- Version: @VERSION@
- Description: libXML library version2.
- Requires:
--Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
-+Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
- Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
Index: textproc/libxml2/files/patch-libxml-2.0.pc.in
===================================================================
--- textproc/libxml2/files/patch-libxml-2.0.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libxml-2.0.pc.in.orig	2010-05-14 11:26:41.000000000 -0400
-+++ libxml-2.0.pc.in	2013-04-09 15:35:53.000000000 -0400
-@@ -9,5 +9,5 @@
- Description: libXML library version2.
- Requires:
- Libs: -L${libdir} -lxml2
--Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
-+Libs.private: @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
- Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
Index: textproc/libxml2/files/patch-xml2-config.in
===================================================================
--- /dev/null
+++ textproc/libxml2/files/patch-xml2-config.in
@@ -0,0 +1,23 @@
+--- xml2-config.in.orig	2015-07-31 11:30:40 UTC
++++ xml2-config.in
+@@ -82,16 +82,11 @@ while test $# -gt 0; do
+        	;;
+ 
+     --libs)
+-        if [ "`uname`" = "Linux" ]
+-	then
+-	    if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+-	    then
+-		echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+-	    else
+-		echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+-	    fi
++        if [ "$2" = "--static" ]
++        then
++            echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
+ 	else
+-	    echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
++	    echo @XML_LIBDIR@ -lxml2 @MODULE_PLATFORM_LIBS@ @WIN32_EXTRA_LIBADD@
+ 	fi
+        	;;
+