Index: head/games/aquaria/Makefile =================================================================== --- head/games/aquaria/Makefile (revision 456743) +++ head/games/aquaria/Makefile (revision 456744) @@ -1,66 +1,66 @@ # $FreeBSD$ PORTNAME= aquaria DISTVERSIONPREFIX= OSE-v DISTVERSION= 1.002-22 DISTVERSIONSUFFIX= -g84366ad -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= jbeich@FreeBSD.org COMMENT= Underwater 2D fantasy action-adventure (game engine) LICENSE= GPLv2+ BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libftgl.so:graphics/ftgl \ libpng.so:graphics/png \ libtinyxml2.so:textproc/tinyxml2 USE_GITHUB= yes GH_ACCOUNT= AquariaOSE GH_PROJECT= Aquaria USES= cmake lua:51 openal pkgconfig EXCLUDE= AL FTGL GL SDL* freetype2 glm glpng/png glpng/zlib \ libogg-* libvorbis-* lua-* tinyxml2* EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ExternalLibs/,} CMAKE_ARGS+= -DAQUARIA_DEFAULT_DATA_DIR="${DATADIR}" \ -DAQUARIA_INTERNAL_FREETYPE=off \ -DAQUARIA_INTERNAL_FTGL=off \ -DAQUARIA_INTERNAL_LUA=off \ -DAQUARIA_INTERNAL_OGGVORBIS=off \ -DAQUARIA_INTERNAL_OPENAL=off \ -DAQUARIA_INTERNAL_PNG=off \ -DAQUARIA_INTERNAL_SDL=off \ -DAQUARIA_INTERNAL_TINYXML2=off \ -DAQUARIA_INTERNAL_ZLIB=off LDFLAGS+= -Wl,--as-needed # avoid overlinking (vorbis deps) SUB_FILES= pkg-message PLIST_FILES= bin/aquaria PORTDATA= * DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ "${DATADIR}/${PORTNAME}.png" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" OPTIONS_DEFINE= DEBUG SDL2 OPTIONS_DEFAULT=SDL2 SDL2_DESC= Use SDL 2.x instead of SDL 1.2.x SDL2_CMAKE_ON= -DAQUARIA_USE_SDL2=on SDL2_USE= SDL=sdl2 SDL2_USE_OFF= SDL=sdl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .for d in game_scripts files (cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} \ "." ${STAGEDIR}${DATADIR}/override) .endfor .include Index: head/games/aquaria/files/patch-Aquaria-Continuity.cpp =================================================================== --- head/games/aquaria/files/patch-Aquaria-Continuity.cpp (nonexistent) +++ head/games/aquaria/files/patch-Aquaria-Continuity.cpp (revision 456744) @@ -0,0 +1,11 @@ +--- Aquaria/Continuity.cpp.orig 2016-06-19 23:56:27 UTC ++++ Aquaria/Continuity.cpp +@@ -2737,7 +2737,7 @@ void Continuity::loadFileData(int slot, + } + if (doc.Parse(buf, size) != XML_SUCCESS) + { +- errorLog("Failed to load save data: " + teh_file + " -- Error: " + doc.GetErrorStr1()); ++ errorLog("Failed to load save data: " + teh_file + " -- Error: " + doc.ErrorStr()); + return; + } + } Property changes on: head/games/aquaria/files/patch-Aquaria-Continuity.cpp ___________________________________________________________________ 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 Index: head/games/aquaria/files/patch-Aquaria-DSQ.cpp =================================================================== --- head/games/aquaria/files/patch-Aquaria-DSQ.cpp (nonexistent) +++ head/games/aquaria/files/patch-Aquaria-DSQ.cpp (revision 456744) @@ -0,0 +1,11 @@ +--- Aquaria/DSQ.cpp.orig 2017-12-19 15:08:56 UTC ++++ Aquaria/DSQ.cpp +@@ -2079,7 +2079,7 @@ void DSQ::loadModsCallback(const std::st + if(!Mod::loadModXML(&d, name)) + { + std::ostringstream os; +- os << "Failed to load mod xml: " << filename << " -- Error: " << d.GetErrorStr1(); ++ os << "Failed to load mod xml: " << filename << " -- Error: " << d.ErrorStr(); + dsq->debugLog(os.str()); + return; + } Property changes on: head/games/aquaria/files/patch-Aquaria-DSQ.cpp ___________________________________________________________________ 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 Index: head/multimedia/libmediainfo/Makefile =================================================================== --- head/multimedia/libmediainfo/Makefile (revision 456743) +++ head/multimedia/libmediainfo/Makefile (revision 456744) @@ -1,52 +1,53 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= libmediainfo PORTVERSION= 17.10 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \ LOCAL/sunpoet DISTNAME= MediaInfo_CLI_${PORTVERSION}_GNU_FromSource MAINTAINER= sunpoet@FreeBSD.org COMMENT= MediaInfo library LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/../../../License.html LIB_DEPENDS= libzen.so:multimedia/libzen CONFLICTS_INSTALL= mediainfo-0.[0-6]* mediainfo-0.7.[0-5]* OPTIONS_DEFINE= CURL MMS TINYXML2 OPTIONS_DEFAULT=TINYXML2 TINYXML2_DESC= Use textproc/tinyxml2 instead of bundled one CONFIGURE_ARGS= --enable-shared --enable-static GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USES= alias libtool localbase pathfix pkgconfig tar:xz WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} CURL_LIB_DEPENDS= libcurl.so:ftp/curl MMS_CONFIGURE_ON= --with-libmms=${LOCALBASE} MMS_LIB_DEPENDS= libmms.so:net/libmms TINYXML2_CONFIGURE_ON= --with-libtinyxml2=yes TINYXML2_LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 post-patch: @${REINPLACE_CMD} \ -e 's|lib/pkgconfig/|libdata/pkgconfig/|g' \ -e 's|-DMEDIAINFO_LIBMMS_FROMSOURCE||g' \ -e 's|with_libmms/pkgconfig/|with_libmms/libdata/pkgconfig/|' \ -e 's|src/.libs|lib|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '1 s|bin/bash|bin/sh|' ${WRKSRC}/libmediainfo-config.in post-install: ${INSTALL_DATA} ${WRKSRC}/libmediainfo.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libmediainfo.pc ${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/ .include Index: head/sysutils/fusefs-encfs/Makefile =================================================================== --- head/sysutils/fusefs-encfs/Makefile (revision 456743) +++ head/sysutils/fusefs-encfs/Makefile (revision 456744) @@ -1,36 +1,36 @@ # Created by: trasz # $FreeBSD$ PORTNAME= encfs PORTVERSION= 1.9.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- MAINTAINER= dg@syrec.org COMMENT= Encrypted pass-through FUSE filesystem LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake:outsource compiler:c++11-lib fuse ssl USE_GITHUB= yes GH_ACCOUNT= vgough OPTIONS_DEFINE= BUNDLED_TINYXML MANPAGES NLS OPTIONS_DEFAULT= BUNDLED_TINYXML MANPAGES OPTIONS_SUB= yes BUNDLED_TINYXML_DESC= Use bundled TinyXML2 instead of textproc/tinyxml2 BUNDLED_TINYXML_CMAKE_BOOL= USE_INTERNAL_TINYXML BUNDLED_TINYXML_LIB_DEPENDS_OFF= libtinyxml2.so:textproc/tinyxml2 MANPAGES_DESC= Install manpages (requires Perl 5) MANPAGES_USES= perl5 MANPAGES_USE= perl5=build NLS_USES= gettext NLS_CMAKE_BOOL= ENABLE_NLS .include Index: head/textproc/tinyxml2/Makefile =================================================================== --- head/textproc/tinyxml2/Makefile (revision 456743) +++ head/textproc/tinyxml2/Makefile (revision 456744) @@ -1,33 +1,33 @@ # Created by: b.f. # $FreeBSD$ PORTNAME= tinyxml2 -PORTVERSION= 5.0.1 +PORTVERSION= 6.0.0 PORTEPOCH= 1 CATEGORIES= textproc MAINTAINER= sunpoet@FreeBSD.org COMMENT= Small C++ XML Parser LICENSE= ZLIB OPTIONS_DEFINE= EXAMPLES CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DBUILD_TESTS=OFF USE_LDCONFIG= yes USES= cmake dos2unix pathfix PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:R} PORTEXAMPLES= * GH_ACCOUNT= leethomason USE_GITHUB= yes post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/ do-test: cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xmltest && ./xmltest .include Index: head/textproc/tinyxml2/distinfo =================================================================== --- head/textproc/tinyxml2/distinfo (revision 456743) +++ head/textproc/tinyxml2/distinfo (revision 456744) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498574190 -SHA256 (leethomason-tinyxml2-5.0.1_GH0.tar.gz) = cd33f70a856b681506e3650f9f5f5e5e6c7232da7fa3cfc4e8f56fe7b77dd735 -SIZE (leethomason-tinyxml2-5.0.1_GH0.tar.gz) = 349622 +TIMESTAMP = 1513198732 +SHA256 (leethomason-tinyxml2-6.0.0_GH0.tar.gz) = 9444ba6322267110b4aca61cbe37d5dcab040344b5c97d0b36c119aa61319b0f +SIZE (leethomason-tinyxml2-6.0.0_GH0.tar.gz) = 576612