Index: head/devel/rlvm/Makefile =================================================================== --- head/devel/rlvm/Makefile (revision 423034) +++ head/devel/rlvm/Makefile (revision 423035) @@ -1,101 +1,97 @@ # $FreeBSD$ PORTNAME= rlvm DISTVERSIONPREFIX= release- DISTVERSION= 0.14-67 DISTVERSIONSUFFIX= -g9350209 PORTREVISION= 1 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org COMMENT= RealLive virtual machine clone LICENSE= GPLv2 GPLv3 MIT LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/include/utf8.h:devel/utf8cpp LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libboost_serialization.so:devel/boost-libs \ libguichan.so:devel/guichan RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USE_GITHUB= yes GH_ACCOUNT= eglaysher USES= compiler:c++11-lib pkgconfig scons USE_GL= glew glu USE_GNOME= gtk20 USE_SDL= image mixer ttf EXCLUDE= GLEW SDL_image SDL_mixer SDL_ttf gmock gtest guichan \ luabind utf8cpp # leaving only pygame, xclannad, *.cpp EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude vendor/,} CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps) MAKE_ARGS= VERBOSE=1 INSTALLS_ICONS= yes PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes -# XXX 9.x EOL to phase out USES=compiler, unblocking lang/gcc update -EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${CHOSEN_COMPILER_TYPE}} -EXTRA_PATCHES_FreeBSD_gcc= ${PATCHDIR}/extra-patch-gcc48 - OPTIONS_DEFINE= DEBUG DOCS NLS TEST OPTIONS_DEFAULT=MONA OPTIONS_MULTI= JAPANESE_FONT OPTIONS_MULTI_JAPANESE_FONT=KOCHI MONA SAZANAMI OPTIONS_SUB= yes JAPANESE_FONT_DESC=msgothic.ttc alternatives with verified metrics (unless --font) KOCHI_DESC= kochi-gothic-subst.ttf from japanese/font-kochi KOCHI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/kochi-gothic-subst.ttf:japanese/font-kochi MONA_DESC= mona.ttf from japanese/font-mona-ttf MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/mona.ttf:japanese/font-mona-ttf SAZANAMI_DESC= sazanami-gothic.ttf from japanese/font-sazanami SAZANAMI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/sazanami-gothic.ttf:japanese/font-sazanami DEBUG_MAKE_ARGS_OFF=--release NLS_USES= gettext NLS_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-nls TEST_USES= lua:51 TEST_BUILD_DEPENDS=googletest>=1.7.0:devel/googletest \ googlemock>=1.7.0:devel/googlemock \ luabind>0:devel/luabind TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-test post-patch: @${GREP} -Flr 'utf8cpp/' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.utf8cpp -e 's,utf8cpp/,,' @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/src/platforms/gtk/gtk_rlvm_instance.cc @${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \ -e 's,truetype/ttf-dejavu,dejavu,' \ -e 's,truetype/[^/"]*/,TTF/,' \ ${WRKSRC}/src/utilities/find_font_file.cc pre-install-TEST-on: (cd ${WRKSRC} && build/${PORTNAME}_unittests) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.6 \ ${STAGEDIR}${MAN6PREFIX}/man/man6 ${INSTALL_DATA} ${WRKSRC}/src/platforms/gtk/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} @(cd ${WRKSRC}/resources && for f in */${PORTNAME}.png; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ ${INSTALL_DATA} -v $$f \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ done) post-install-NLS-on: (cd ${WRKSRC}/build/locale && ${COPYTREE_SHARE} \ . ${STAGEDIR}${PREFIX}/share/locale) post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS:Nnotes}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ notes ${STAGEDIR}${DOCSDIR}) .include Index: head/devel/rlvm/files/extra-patch-gcc48 =================================================================== --- head/devel/rlvm/files/extra-patch-gcc48 (revision 423034) +++ head/devel/rlvm/files/extra-patch-gcc48 (nonexistent) @@ -1,16 +0,0 @@ -https://github.com/eglaysher/rlvm/issues/80 - -diff --git src/base/notification_registrar.cc src/base/notification_registrar.cc -index 2b9d99d..2a6f63f 100644 ---- src/base/notification_registrar.cc -+++ src/base/notification_registrar.cc -@@ -46,7 +46,8 @@ - } - - Record record = { observer, type, source }; -- auto found = std::find(registered_.cbegin(), registered_.cend(), record); -+ RecordVector::iterator found = std::find( -+ registered_.begin(), registered_.end(), record); - registered_.erase(found); - - // This can be NULL if our owner outlives the NotificationService, e.g. if our Property changes on: head/devel/rlvm/files/extra-patch-gcc48 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/rlvm/files/patch-src_base_notification__registrar.cc =================================================================== --- head/devel/rlvm/files/patch-src_base_notification__registrar.cc (nonexistent) +++ head/devel/rlvm/files/patch-src_base_notification__registrar.cc (revision 423035) @@ -0,0 +1,17 @@ +https://github.com/eglaysher/rlvm/issues/80 + +--- src/base/notification_registrar.cc.orig 2016-07-30 22:27:57 UTC ++++ src/base/notification_registrar.cc +@@ -46,7 +46,12 @@ void NotificationRegistrar::Remove(Notif + } + + Record record = { observer, type, source }; ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5 ++ RecordVector::iterator found = std::find( ++ registered_.begin(), registered_.end(), record); ++#else + auto found = std::find(registered_.cbegin(), registered_.cend(), record); ++#endif + registered_.erase(found); + + // This can be NULL if our owner outlives the NotificationService, e.g. if our Property changes on: head/devel/rlvm/files/patch-src_base_notification__registrar.cc ___________________________________________________________________ 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