Date: Wed, 13 Jan 2016 15:19:04 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406049 - in head/textproc/xqilla: . files Message-ID: <201601131519.u0DFJ4AU000647@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Jan 13 15:19:04 2016 New Revision: 406049 URL: https://svnweb.freebsd.org/changeset/ports/406049 Log: Upgrade to 2.3.2. PR: 201854 Submitted by: tkato432@yahoo.com Added: head/textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp (contents, props changed) head/textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp (contents, props changed) head/textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp (contents, props changed) head/textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp (contents, props changed) Deleted: head/textproc/xqilla/files/patch-gcc-werror Modified: head/textproc/xqilla/Makefile head/textproc/xqilla/distinfo head/textproc/xqilla/pkg-plist Modified: head/textproc/xqilla/Makefile ============================================================================== --- head/textproc/xqilla/Makefile Wed Jan 13 14:11:22 2016 (r406048) +++ head/textproc/xqilla/Makefile Wed Jan 13 15:19:04 2016 (r406049) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= xqilla -PORTVERSION= 2.3.0 -PORTREVISION= 3 +PORTVERSION= 2.3.2 PORTEPOCH= 1 CATEGORIES= textproc -MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME} DISTNAME= XQilla-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -15,27 +14,34 @@ COMMENT= XQuery and XPath2 library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 +LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \ + libtidy.so:${PORTSDIR}/www/tidy-lib -USES= gmake libtool -USE_LDCONFIG= yes +USES= libtool GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -PORTDOCS= * +CONFIGURE_ARGS= --with-xerces=${LOCALBASE} \ + --with-faxpp=no \ + --with-tidy=${LOCALBASE} INSTALL_TARGET= install-strip +USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS - -MAKE_JOBS_UNSAFE= yes - -DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ - dot:${PORTSDIR}/graphics/graphviz - -post-build-DOCS-on: - cd ${WRKSRC} && ${MAKE_CMD} docs +OPTIONS_DEFINE= DOXYGEN -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \*-api ${STAGEDIR}${DOCSDIR} +DOCYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ + dot:${PORTSDIR}/graphics/graphviz +DOCYGEN_ALL_TARGET= all docs + +post-patch: + @${REINPLACE_CMD} -e \ + 's|[[:blank:]]-R$$(xerces_lib)||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|[[:blank:]]-R$$with_.*"|"|' ${WRKSRC}/configure + +post-install-DOXYGEN-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "*-api" \ + ${STAGEDIR}${DOCSDIR}) + @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||} \ + ! -type d >> ${TMPPLIST}) .include <bsd.port.mk> Modified: head/textproc/xqilla/distinfo ============================================================================== --- head/textproc/xqilla/distinfo Wed Jan 13 14:11:22 2016 (r406048) +++ head/textproc/xqilla/distinfo Wed Jan 13 15:19:04 2016 (r406049) @@ -1,2 +1,2 @@ -SHA256 (XQilla-2.3.0.tar.gz) = 60e163cbbbe2900f999ee863bfa5a63d913b1d6e2ea17376302d565d2e9e1bc7 -SIZE (XQilla-2.3.0.tar.gz) = 7409736 +SHA256 (XQilla-2.3.2.tar.gz) = 5ae0aed4091521d5c2f541093e02a81ebe55a9087ba735f80b110068584e217c +SIZE (XQilla-2.3.2.tar.gz) = 16163811 Added: head/textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/xqilla/files/patch-include__xqilla__events__EventHandler.hpp Wed Jan 13 15:19:04 2016 (r406049) @@ -0,0 +1,27 @@ +--- include/xqilla/events/EventHandler.hpp.orig 2015-05-18 17:38:59 UTC ++++ include/xqilla/events/EventHandler.hpp +@@ -33,7 +33,9 @@ public: + + /** Recieves a LocationInfo object that is owned by the caller, and will be + updated with the current location information as the parse progresses. */ +- virtual void setLocationInfo(const LocationInfo *location) {} ++ virtual void setLocationInfo(const LocationInfo *location) { ++ (void) location; ++ } + + /** Handles a document node as an event */ + virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding) = 0; +@@ -59,7 +61,12 @@ public: + virtual void namespaceEvent(const XMLCh *prefix, const XMLCh *uri) = 0; + /** Handles an atomic item as an event */ + virtual void atomicItemEvent(AnyAtomicType::AtomicObjectType type, const XMLCh *value, +- const XMLCh *typeURI, const XMLCh *typeName) {} ++ const XMLCh *typeURI, const XMLCh *typeName) { ++ (void) type; ++ (void) value; ++ (void) typeURI; ++ (void) typeName; ++ } + /** Called when all events have been reported */ + virtual void endEvent() = 0; + }; Added: head/textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/xqilla/files/patch-include__xqilla__events__EventSerializer.hpp Wed Jan 13 15:19:04 2016 (r406049) @@ -0,0 +1,13 @@ +--- include/xqilla/events/EventSerializer.hpp.orig 2015-05-18 17:38:59 UTC ++++ include/xqilla/events/EventSerializer.hpp +@@ -35,7 +35,9 @@ public: + XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager); + ~EventSerializer(); + +- virtual void setLocationInfo(const LocationInfo *location) {} ++ virtual void setLocationInfo(const LocationInfo *location) { ++ (void) location; ++ } + + virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding); + virtual void endDocumentEvent(); Added: head/textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp Wed Jan 13 15:19:04 2016 (r406049) @@ -0,0 +1,11 @@ +--- include/xqilla/runtime/ResultImpl.hpp.orig 2015-05-18 17:38:59 UTC ++++ include/xqilla/runtime/ResultImpl.hpp +@@ -59,7 +59,7 @@ protected: + Result *resultPointer_; + + private: +- ResultImpl(const ResultImpl &) {}; ++ ResultImpl(const ResultImpl &) : LocationInfo() {}; + ResultImpl &operator=(const ResultImpl &) { return *this; }; + }; + Added: head/textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp Wed Jan 13 15:19:04 2016 (r406049) @@ -0,0 +1,18 @@ +--- include/xqilla/simple-api/XQillaConfiguration.hpp.orig 2015-05-18 17:38:59 UTC ++++ include/xqilla/simple-api/XQillaConfiguration.hpp +@@ -53,9 +53,13 @@ public: + + virtual ASTToXML *createASTToXML() = 0; + +- virtual void populateStaticContext(StaticContext *context) {} ++ virtual void populateStaticContext(StaticContext *context) { ++ (void) context; ++ } + +- virtual void populateDynamicContext(DynamicContext *context) {} ++ virtual void populateDynamicContext(DynamicContext *context) { ++ (void) context; ++ } + + virtual void testInterrupt() {} + }; Modified: head/textproc/xqilla/pkg-plist ============================================================================== --- head/textproc/xqilla/pkg-plist Wed Jan 13 14:11:22 2016 (r406048) +++ head/textproc/xqilla/pkg-plist Wed Jan 13 15:19:04 2016 (r406049) @@ -394,5 +394,5 @@ include/xqilla/xqts/TestSuiteResultListe include/xqilla/xqts/TestSuiteRunner.hpp lib/libxqilla.a lib/libxqilla.so -lib/libxqilla.so.6 -lib/libxqilla.so.6.0.0 +lib/libxqilla.so.4 +lib/libxqilla.so.4.2.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601131519.u0DFJ4AU000647>