Hi ports@, Here is a diff to fix stepmania build with Clang 6 (handpicked from upstream commits).
Comments? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/games/stepmania/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 21 Nov 2017 00:13:00 -0000 1.20 +++ Makefile 18 Apr 2018 07:17:37 -0000 @@ -7,7 +7,7 @@ CATEGORIES = games emulators DISTNAME = stepmania-5.0b2a PKGNAME = stepmania-5.0beta2a -REVISION = 8 +REVISION = 9 EXTRACT_SUFX = -src.tar.bz2 HOMEPAGE = http://www.stepmania.com MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=stepmania/} Index: patches/patch-src_PrefsManager_cpp =================================================================== RCS file: patches/patch-src_PrefsManager_cpp diff -N patches/patch-src_PrefsManager_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_PrefsManager_cpp 18 Apr 2018 07:17:37 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +Fix for Clang 6. +Handpicked from upstream commit 8660d49aae9e4e357d750ffd1dbb7ef850b2b76d. + +Index: src/PrefsManager.cpp +--- src/PrefsManager.cpp.orig ++++ src/PrefsManager.cpp +@@ -355,7 +355,7 @@ void PrefsManager::StoreGamePrefs() + ASSERT( !m_sCurrentGame.Get().empty() ); + + // save off old values +- GamePrefs &gp = m_mapGameNameToGamePrefs[m_sCurrentGame]; ++ GamePrefs &gp = m_mapGameNameToGamePrefs[m_sCurrentGame.ToString()]; + gp.m_sAnnouncer = m_sAnnouncer; + gp.m_sTheme = m_sTheme; + gp.m_sDefaultModifiers = m_sDefaultModifiers; Index: patches/patch-src_ProfileManager_cpp =================================================================== RCS file: patches/patch-src_ProfileManager_cpp diff -N patches/patch-src_ProfileManager_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_ProfileManager_cpp 18 Apr 2018 07:17:37 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +Fix for Clang 6. +Handpicked from upstream commit 8660d49aae9e4e357d750ffd1dbb7ef850b2b76d. + +Index: src/ProfileManager.cpp +--- src/ProfileManager.cpp.orig ++++ src/ProfileManager.cpp +@@ -207,7 +207,7 @@ bool ProfileManager::LoadLocalProfileFromMachine( Play + void ProfileManager::GetMemoryCardProfileDirectoriesToTry( vector<RString> &asDirsToTry ) + { + /* Try to load the preferred profile. */ +- asDirsToTry.push_back( PREFSMAN->m_sMemoryCardProfileSubdir ); ++ asDirsToTry.push_back( PREFSMAN->m_sMemoryCardProfileSubdir.ToString() ); + + /* If that failed, try loading from all fallback directories. */ + split( g_sMemoryCardProfileImportSubdirs, ";", asDirsToTry, true );
