Index: head/converters/p5-XML-WBXML/Makefile
===================================================================
--- head/converters/p5-XML-WBXML/Makefile	(revision 399104)
+++ head/converters/p5-XML-WBXML/Makefile	(revision 399105)
@@ -1,28 +1,28 @@
 # Created by: Aaron Dalton <aaron@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	XML-WBXML
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between XML and WBXML using libwbxml2
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
 
 USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile.PL
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/WBXML/WBXML.so
 
 .include <bsd.port.mk>
Index: head/converters/p5-XML-WBXML/files/patch-Makefile.PL
===================================================================
--- head/converters/p5-XML-WBXML/files/patch-Makefile.PL	(revision 399104)
+++ head/converters/p5-XML-WBXML/files/patch-Makefile.PL	(revision 399105)
@@ -1,14 +1,14 @@
 --- Makefile.PL.orig	2015-05-21 10:43:29 UTC
 +++ Makefile.PL
 @@ -10,9 +10,9 @@ WriteMakefile(
      ABSTRACT_FROM => 'lib/XML/WBXML.pm',                                                                            # retrieve abstract from module
      LICENSE       => 'perl_5',
      PREREQ_PM     => {},                                                                                         # e.g., Module::Name => 1.1
 -    LIBS          => ['-lwbxml2'],                                                                               # e.g., '-lm'
 +    LIBS          => ['-L%%LOCALBASE%%/lib -lwbxml2'],                                                                               # e.g., '-lm'
      DEFINE        => '',                                                                                         # e.g., '-DHAVE_SOMETHING'
 -    INC           => '-I.',                                                                                      # e.g., '-I. -I/usr/include/other'
-+    INC           => '-I. -I%%LOCALBASE%%/include -I/usr/local/include/libwbxml-1.0/wbxml',                      # e.g., '-I. -I/usr/include/other'
++    INC           => '-I. -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/libwbxml-1.0/wbxml',                   # e.g., '-I. -I/usr/include/other'
  
      # Un-comment this if you add C files to link with later:
      # OBJECT            => '$(O_FILES)', # link all the C files too
Index: head/textproc/pecl-wbxml/Makefile
===================================================================
--- head/textproc/pecl-wbxml/Makefile	(revision 399104)
+++ head/textproc/pecl-wbxml/Makefile	(revision 399105)
@@ -1,27 +1,27 @@
 # Created by: Florian Smeets <flo@smeets.im>
 # $FreeBSD$
 
 PORTNAME=	wbxml
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
 DIST_SUBDIR=	PECL
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	PECL extension that provides WBXML conversion capabilities
 
 LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
 
 USES=tar:tgz
 
 CONFIGURE_ARGS=	--with-wbxml=${LOCALBASE} \
 		--with-libexpat-dir=${LOCALBASE}
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.m4
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config.m4
 
 .include <bsd.port.mk>
Index: head/textproc/pecl-wbxml/files/patch-config.m4
===================================================================
--- head/textproc/pecl-wbxml/files/patch-config.m4	(revision 399104)
+++ head/textproc/pecl-wbxml/files/patch-config.m4	(revision 399105)
@@ -1,33 +1,33 @@
 --- config.m4.orig	2009-02-22 11:30:57 UTC
 +++ config.m4
 @@ -43,7 +43,7 @@ if test "$PHP_WBXML" != "no"; then
    ],-L$WBXML_LIBDIR)
  
    PHP_ADD_LIBRARY_WITH_PATH(wbxml2, $WBXML_LIBDIR, WBXML_SHARED_LIBADD)
 -  PHP_ADD_INCLUDE($WBXML_DIR/include)
-+  PHP_ADD_INCLUDE(/usr/local/include/libwbxml-1.0)
++  PHP_ADD_INCLUDE(%%LOCALBASE%%/include/libwbxml-1.0)
  
    for i in $PHP_LIBEXPAT_DIR /usr/local /usr; do
      for j in $PHP_LIBDIR lib64 lib; do
 @@ -74,21 +74,6 @@ if test "$PHP_WBXML" != "no"; then
      CFLAGS="$CFLAGS -Wall"
    fi
  
 -  AC_DEFINE(WBXML_ENCODER_USE_STRTBL,1,[ ])
 -
 -  AC_DEFINE(WBXML_SUPPORT_WML,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_WTA,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_SI,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_SL,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_CO,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_PROV,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_EMN,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_DRMREL,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_OTA_SETTINGS,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_SYNCML,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_WV,1,[ ])
 -  AC_DEFINE(WBXML_SUPPORT_AIRSYNC,1,[ ])
 -
    PHP_SUBST(WBXML_SHARED_LIBADD)
    PHP_NEW_EXTENSION(wbxml, wbxml.c, $ext_shared)
  fi