Index: head/games/glest/Makefile =================================================================== --- head/games/glest/Makefile (revision 345850) +++ head/games/glest/Makefile (revision 345851) @@ -1,91 +1,91 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= glest PORTVERSION= 3.2.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION} DISTNAME= ${PORTNAME}_source_${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Free 3D real-time customizable strategy game -LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ - vorbis.4:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ + libvorbis.so:${PORTSDIR}/audio/libvorbis BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data USES= dos2unix openal:al,alut pkgconfig USE_AUTOTOOLS= automake:env autoconf:env USE_ZIP= yes USE_LUA= 5.1 USE_SDL= yes USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= mk/linux/configure CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -qa OPTIONS_DEFINE= EDITOR EDITOR_DESC= Build map editor EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} NO_STAGE= yes .include .include .if ${PORT_OPTIONS:MEDITOR} USE_WX= 2.6+ WX_CONF_ARGS= relative WANT_UNICODE= yes PLIST_SUB+= EDITOR="" HAVE_EDITOR= true .else PLIST_SUB+= EDITOR="@comment " .endif pre-extract: @${MKDIR} ${WRKDIR}/${DISTNAME} post-patch: @${REINPLACE_CMD} -e "s|%%ACLOCAL%%|${ACLOCAL}|g" -e "s|%%AUTOCONF%%|${AUTOCONF}|g" \ ${WRKSRC}/mk/linux/autogen.sh @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' -e \ 's|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="${PTHREAD_LIBS}"|g' -e \ 's|pthreads library -l[$$]flag|pthreads library ${PTHREAD_LIBS}|g' -e \ 's|include/lua5.1|include/lua51|g' -e 's|-llua5.1|-llua-5.1|g' \ ${WRKSRC}/mk/linux/configure.ac ${WRKSRC}/mk/linux/mk/autoconf/* @${FIND} -E ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | ${XARGS} ${RM} pre-configure: @cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \ ${REINPLACE_CMD} -e 's|-llua5.1|-llua-5.1|g' -e 's|.lng||g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/mk/linux/glest.ini do-build: @cd ${WRKSRC} && ${JAM_CMD} do-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${DOCSDIR}/code_license.txt .endif @${MKDIR} ${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/glest ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/mk/linux/glest.ini ${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${PREFIX}/bin/${PORTNAME} .if defined(HAVE_EDITOR) ${INSTALL_PROGRAM} ${WRKSRC}/glest_editor ${PREFIX}/bin/ .endif post-install: @${CAT} ${PKGMESSAGE} .include Index: head/games/glest/files/patch-xerces-c3 =================================================================== --- head/games/glest/files/patch-xerces-c3 (nonexistent) +++ head/games/glest/files/patch-xerces-c3 (revision 345851) @@ -0,0 +1,48 @@ +--- source/shared_lib/sources/xml/xml_parser.cpp.orig 2014-02-24 15:26:00.412992000 +0100 ++++ source/shared_lib/sources/xml/xml_parser.cpp 2014-02-24 15:28:23.623987237 +0100 +@@ -87,10 +87,17 @@ + + try{ + ErrorHandler errorHandler; +- DOMBuilder *parser= (static_cast(implementation))->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); +- parser->setErrorHandler(&errorHandler); +- parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); +- parser->setFeature(XMLUni::fgDOMValidation, true); ++#if XERCES_VERSION_MAJOR < 3 ++ DOMBuilder *parser= (static_cast(implementation))->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0); ++ parser->setErrorHandler(&errorHandler); ++ parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); ++ parser->setFeature(XMLUni::fgDOMValidation, true); ++#else ++ DOMLSParser *parser = (static_cast(implementation))->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0); ++ DOMConfiguration *config = parser->getDomConfig(); ++ config->setParameter(XMLUni::fgXercesSchemaFullChecking, true); ++ config->setParameter(XMLUni::fgDOMValidate, true); ++#endif + DOMDocument *document= parser->parseURI(path.c_str()); + + if(document==NULL){ +@@ -119,9 +126,20 @@ + } + + LocalFileFormatTarget file(path.c_str()); +- DOMWriter* writer = implementation->createDOMWriter(); +- writer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true); +- writer->writeNode(&file, *document); ++#if XERCES_VERSION_MAJOR < 3 ++ DOMWriter* writer = implementation->createDOMWriter(); ++ writer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true); ++ writer->writeNode(&file, *document); ++#else ++ DOMLSSerializer *serializer = implementation->createLSSerializer(); ++ DOMLSOutput* output=implementation->createLSOutput(); ++ DOMConfiguration* config=serializer->getDomConfig(); ++ config->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint,true); ++ output->setByteStream(&file); ++ serializer->write(document,output); ++ output->release(); ++ serializer->release(); ++#endif + document->release(); + } + catch(const DOMException &e){ Property changes on: head/games/glest/files/patch-xerces-c3 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property