Index: textproc/py-libxml2/Makefile
===================================================================
--- textproc/py-libxml2/Makefile	(revision 316117)
+++ textproc/py-libxml2/Makefile	(working copy)
@@ -16,8 +16,6 @@ PLIST=		${.CURDIR}/pkg-plist
 
 USE_GNOME+=	libxml2
 USE_PYTHON=	yes
-CPPFLAGS+=	`${PYTHON_VERSION}-config --cflags`
-LDFLAGS+=	-L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs`
 CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
@@ -26,6 +24,9 @@ CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
 DOCSDIR=	${PREFIX}/share/doc/py-libxml2
 EXAMPLESDIR=	${PREFIX}/share/examples/py-libxml2
 
+pre-patch:
+	@${REINPLACE_CMD} -e 's|^XML_LIBS=.*|XML_LIBS=`${LOCALBASE}/bin/xml2-config --libs`|' ${WRKSRC}/configure
+
 post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
Index: textproc/libxml2/files/patch-configure
===================================================================
--- textproc/libxml2/files/patch-configure	(revision 316117)
+++ textproc/libxml2/files/patch-configure	(working copy)
@@ -1,6 +1,6 @@
---- configure.orig	2012-08-04 11:48:19.000000000 +0200
-+++ configure	2012-08-04 11:50:50.000000000 +0200
-@@ -14228,11 +14228,12 @@ fi
+--- configure.orig	2012-05-23 04:56:30.000000000 -0400
++++ configure	2013-04-19 19:17:06.000000000 -0400
+@@ -14228,11 +14228,12 @@
      fi
      if test "$PYTHON_VERSION" != ""
      then
@@ -8,13 +8,14 @@
  	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
  	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
  	then
- 	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
+-	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
 -	    PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
++	    PYTHON_INCLUDES=`python$PYTHON_VERSION-config --cflags`
 +	    PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
  	else
  	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
  	    then
-@@ -14635,6 +14636,8 @@ fi
+@@ -14635,6 +14636,8 @@
  	       fi
  	   fi
         ;;
Index: textproc/libxml2/files/patch-python_Makefile.in
===================================================================
--- textproc/libxml2/files/patch-python_Makefile.in	(revision 316117)
+++ textproc/libxml2/files/patch-python_Makefile.in	(working copy)
@@ -1,6 +1,12 @@
---- python/Makefile.in.orig	2012-08-04 12:00:53.000000000 +0200
-+++ python/Makefile.in	2012-08-04 12:02:59.000000000 +0200
-@@ -395,7 +395,7 @@
+--- python/Makefile.in.orig	2012-05-23 04:56:32.000000000 -0400
++++ python/Makefile.in	2013-04-19 18:51:21.000000000 -0400
+@@ -390,12 +390,12 @@
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ SUBDIRS = . tests
+ INCLUDES = \
+-	-I$(PYTHON_INCLUDES) \
++	$(PYTHON_INCLUDES) \
+ 	-I$(top_srcdir)/include	\
  	-I$(top_builddir)/include \
  	-I$(top_builddir)/$(subdir)
  
@@ -9,18 +15,17 @@
  # libxml2class.txt is generated
  dist_docs_DATA = TODO
  EXTRA_DIST = \
-@@ -408,12 +408,12 @@
+@@ -408,12 +408,11 @@
  
  libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
  @WITH_PYTHON_TRUE@mylibs = \
 -@WITH_PYTHON_TRUE@	$(top_builddir)/libxml2.la
-+@WITH_PYTHON_TRUE@	-lxml2
  
  @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
  @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c
  @WITH_PYTHON_TRUE@nodist_libxml2mod_la_SOURCES = libxml2-py.c
 -@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ -lpython$(PYTHON_VERSION)
-+@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@
++@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = @XML_LIBS@ @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@
  @WITH_PYTHON_TRUE@python_DATA = \
  @WITH_PYTHON_TRUE@	libxml2.py