svn commit: r399105 - in head: converters/p5-XML-WBXML converters/p5-XML-WBXML/files textproc/pecl-wbxml textproc/pecl-wbxml/files
Florian Smeets
flo at FreeBSD.org
Sun Oct 11 21:51:30 UTC 2015
Author: flo
Date: Sun Oct 11 21:51:28 2015
New Revision: 399105
URL: https://svnweb.freebsd.org/changeset/ports/399105
Log:
Fixes to r399104. Don't use hard coded /usr/local in patch files, and
replace the correct variables.
Pointy hat to: flo
Modified:
head/converters/p5-XML-WBXML/Makefile
head/converters/p5-XML-WBXML/files/patch-Makefile.PL
head/textproc/pecl-wbxml/Makefile
head/textproc/pecl-wbxml/files/patch-config.m4
Modified: head/converters/p5-XML-WBXML/Makefile
==============================================================================
--- head/converters/p5-XML-WBXML/Makefile Sun Oct 11 21:34:11 2015 (r399104)
+++ head/converters/p5-XML-WBXML/Makefile Sun Oct 11 21:51:28 2015 (r399105)
@@ -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
Modified: head/converters/p5-XML-WBXML/files/patch-Makefile.PL
==============================================================================
--- head/converters/p5-XML-WBXML/files/patch-Makefile.PL Sun Oct 11 21:34:11 2015 (r399104)
+++ head/converters/p5-XML-WBXML/files/patch-Makefile.PL Sun Oct 11 21:51:28 2015 (r399105)
@@ -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
Modified: head/textproc/pecl-wbxml/Makefile
==============================================================================
--- head/textproc/pecl-wbxml/Makefile Sun Oct 11 21:34:11 2015 (r399104)
+++ head/textproc/pecl-wbxml/Makefile Sun Oct 11 21:51:28 2015 (r399105)
@@ -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>
Modified: head/textproc/pecl-wbxml/files/patch-config.m4
==============================================================================
--- head/textproc/pecl-wbxml/files/patch-config.m4 Sun Oct 11 21:34:11 2015 (r399104)
+++ head/textproc/pecl-wbxml/files/patch-config.m4 Sun Oct 11 21:51:28 2015 (r399105)
@@ -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
More information about the svn-ports-head
mailing list