Index: head/converters/p5-XML-WBXML/Makefile =================================================================== --- head/converters/p5-XML-WBXML/Makefile (revision 399103) +++ head/converters/p5-XML-WBXML/Makefile (revision 399104) @@ -1,27 +1,28 @@ # Created by: Aaron Dalton # $FreeBSD$ PORTNAME= XML-WBXML PORTVERSION= 0.09 +PORTREVISION= 1 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 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/WBXML/WBXML.so .include Index: head/converters/p5-XML-WBXML/files/patch-Makefile.PL =================================================================== --- head/converters/p5-XML-WBXML/files/patch-Makefile.PL (revision 399103) +++ head/converters/p5-XML-WBXML/files/patch-Makefile.PL (revision 399104) @@ -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', # 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' # 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 399103) +++ head/textproc/pecl-wbxml/Makefile (revision 399104) @@ -1,22 +1,27 @@ # Created by: Florian Smeets # $FreeBSD$ PORTNAME= wbxml PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= textproc pear MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- -EXTRACT_SUFX= .tgz 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 .include Index: head/textproc/pecl-wbxml/files/patch-config.m4 =================================================================== --- head/textproc/pecl-wbxml/files/patch-config.m4 (revision 399103) +++ head/textproc/pecl-wbxml/files/patch-config.m4 (revision 399104) @@ -1,24 +1,33 @@ ---- config.m4.orig 2009-03-11 17:57:16.000000000 +0100 -+++ config.m4 2009-03-11 17:57:27.000000000 +0100 -@@ -74,21 +74,6 @@ +--- 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) + + 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 Index: head/textproc/pecl-wbxml/files/patch-wbxml.c =================================================================== --- head/textproc/pecl-wbxml/files/patch-wbxml.c (revision 399103) +++ head/textproc/pecl-wbxml/files/patch-wbxml.c (revision 399104) @@ -1,13 +1,16 @@ ---- wbxml.c.orig 2009-03-11 18:12:19.000000000 +0100 -+++ wbxml.c 2009-03-11 18:12:27.000000000 +0100 -@@ -27,6 +27,10 @@ +--- wbxml.c.orig 2009-01-29 19:13:57 UTC ++++ wbxml.c +@@ -27,8 +27,12 @@ #include "ext/standard/info.h" #include "php_wbxml.h" +#ifdef HAVE_EXPAT +#include "expat.h" +#endif + #undef HAVE_LIBXML - #include "wbxml.h" +-#include "wbxml.h" ++#include "wbxml/wbxml.h" + /* {{{ wbxml_functions[] + */ Index: head/textproc/pecl-wbxml/pkg-descr =================================================================== --- head/textproc/pecl-wbxml/pkg-descr (revision 399103) +++ head/textproc/pecl-wbxml/pkg-descr (revision 399104) @@ -1,4 +1,4 @@ This extension provides WBXML (Wireless Binary XML) conversion capabilities using the libwbxml library, which can be found at https://libwbxml.opensync.org/ -WWW: http://pecl.php.net/package/WBXML/ +WWW: http://pecl.php.net/package/WBXML/ Index: head/textproc/wbxml2/Makefile =================================================================== --- head/textproc/wbxml2/Makefile (revision 399103) +++ head/textproc/wbxml2/Makefile (revision 399104) @@ -1,33 +1,32 @@ # Created by: Clemens Zauner # $FreeBSD$ PORTNAME= wbxml2 -PORTVERSION= 0.10.9 -PORTREVISION= 1 +PORTVERSION= 0.11.2 CATEGORIES= textproc devel MASTER_SITES= SF/libwbxml/libwbxml/${PORTVERSION} DISTNAME= libwbxml-${PORTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT= Library & tools for converting wbxml<->xml LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 USES= cmake:outsource iconv tar:bzip2 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/libwbxml-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/libwbxml OPTIONS_DEFINE= DOCS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS BUGS ChangeLog NEWS README References THANKS TODO ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/textproc/wbxml2/distinfo =================================================================== --- head/textproc/wbxml2/distinfo (revision 399103) +++ head/textproc/wbxml2/distinfo (revision 399104) @@ -1,2 +1,2 @@ -SHA256 (libwbxml-0.10.9.tar.bz2) = 8ca60c9360536680d538cafbb5947ae2bae6fea5ff704f1bbdf166183b698d59 -SIZE (libwbxml-0.10.9.tar.bz2) = 350697 +SHA256 (libwbxml-0.11.2.tar.bz2) = 5f642027ece0225d80ef21979a57cf59b1027d46cb8dbd5ff4b87662eec2557d +SIZE (libwbxml-0.11.2.tar.bz2) = 354176 Index: head/textproc/wbxml2/files/patch-CMakeLists.txt =================================================================== --- head/textproc/wbxml2/files/patch-CMakeLists.txt (revision 399103) +++ head/textproc/wbxml2/files/patch-CMakeLists.txt (revision 399104) @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2009-05-12 20:43:10.000000000 +0900 -+++ CMakeLists.txt 2009-08-12 05:53:35.000000000 +0900 -@@ -36,7 +36,7 @@ +--- CMakeLists.txt.orig 2012-07-20 12:29:52 UTC ++++ CMakeLists.txt +@@ -44,7 +44,7 @@ SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_D SET( LIB_SUFFIX "" CACHE STRING "The library directory suffix. 32bit empty string, 64 for 64bit." ) SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE INTERNAL "libary location" ) -SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The library data directory" ) +SET( LIBDATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata" CACHE PATH "The library data directory" ) SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE INTERNAL "binary location" ) SET( SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE INTERNAL "data location" ) SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE INTERNAL "headers location" ) -@@ -176,7 +176,7 @@ +@@ -191,7 +191,7 @@ MARK_AS_ADVANCED( CLEAR BUILD_DOCUMENTAT # ADD_CUSTOM_TARGET( DoxygenDoc ) # ADD_DEPENDENCIES( DoxygenDoc DoxygenDocLibrary DoxygenDocTools ) #ENDIF ( BUILD_DOCUMENTATION ) -OPTION( ENABLE_INSTALL_DOC "install documentation" ON ) +OPTION( ENABLE_INSTALL_DOC "install documentation" OFF ) IF( ENABLE_INSTALL_DOC ) ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/AUTHORS ) ADD_DOCUMENTATION( TEXT FILE ${CMAKE_SOURCE_DIR}/BUGS ) Index: head/textproc/wbxml2/pkg-plist =================================================================== --- head/textproc/wbxml2/pkg-plist (revision 399103) +++ head/textproc/wbxml2/pkg-plist (revision 399104) @@ -1,32 +1,20 @@ bin/wbxml2xml bin/xml2wbxml -include/wbxml.h -include/wbxml_base64.h -include/wbxml_buffers.h -include/wbxml_charset.h -include/wbxml_config.h -include/wbxml_conv.h -include/wbxml_elt.h -include/wbxml_encoder.h -include/wbxml_errors.h -include/wbxml_handlers.h -include/wbxml_lists.h -include/wbxml_log.h -include/wbxml_mem.h -include/wbxml_parser.h -include/wbxml_tables.h -include/wbxml_tree.h -include/wbxml_tree_clb_wbxml.h -include/wbxml_tree_clb_xml.h +include/libwbxml-1.0/wbxml/wbxml.h +include/libwbxml-1.0/wbxml/wbxml_config.h +include/libwbxml-1.0/wbxml/wbxml_conv.h +include/libwbxml-1.0/wbxml/wbxml_defines.h +include/libwbxml-1.0/wbxml/wbxml_errors.h lib/libwbxml2.so -lib/libwbxml2.so.0 -lib/libwbxml2.so.0.0.18 +lib/libwbxml2.so.1 +lib/libwbxml2.so.1.0.4 libdata/pkgconfig/libwbxml2.pc +share/cmake/Modules/FindLibWbxml2.cmake %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/References %%PORTDOCS%%%%DOCSDIR%%/THANKS %%PORTDOCS%%%%DOCSDIR%%/TODO