aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/p5-XML-WBXML/Makefile4
-rw-r--r--converters/p5-XML-WBXML/files/patch-Makefile.PL2
-rw-r--r--textproc/pecl-wbxml/Makefile4
-rw-r--r--textproc/pecl-wbxml/files/patch-config.m42
4 files changed, 6 insertions, 6 deletions
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index 3ac4f88b64f5..a3898d32a3bf 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -3,7 +3,7 @@
PORTNAME= XML-WBXML
PORTVERSION= 0.09
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -20,7 +20,7 @@ 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
diff --git a/converters/p5-XML-WBXML/files/patch-Makefile.PL b/converters/p5-XML-WBXML/files/patch-Makefile.PL
index ece4876d8a4e..0e9435a435f2 100644
--- a/converters/p5-XML-WBXML/files/patch-Makefile.PL
+++ b/converters/p5-XML-WBXML/files/patch-Makefile.PL
@@ -8,7 +8,7 @@
+ 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
diff --git a/textproc/pecl-wbxml/Makefile b/textproc/pecl-wbxml/Makefile
index c6d317037178..5e1e6db71194 100644
--- a/textproc/pecl-wbxml/Makefile
+++ b/textproc/pecl-wbxml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wbxml
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -22,6 +22,6 @@ 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>
diff --git a/textproc/pecl-wbxml/files/patch-config.m4 b/textproc/pecl-wbxml/files/patch-config.m4
index a3490e365f67..09c2c913a0c7 100644
--- a/textproc/pecl-wbxml/files/patch-config.m4
+++ b/textproc/pecl-wbxml/files/patch-config.m4
@@ -5,7 +5,7 @@
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