Date: Tue, 13 Dec 2016 16:26:20 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428507 - in head/games/pinball: . files Message-ID: <201612131626.uBDGQKi3011461@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Dec 13 16:26:19 2016 New Revision: 428507 URL: https://svnweb.freebsd.org/changeset/ports/428507 Log: - Fix build with libc++ 3.9 - Add LICENSE_FILE - Switch to USES=localbase - Simplify docs installation PR: 214651 Reported by: jbeich Approved by: maintainer timeout (thierry, 3 weeks) Added: head/games/pinball/files/patch-base_Config.cpp (contents, props changed) Modified: head/games/pinball/Makefile Modified: head/games/pinball/Makefile ============================================================================== --- head/games/pinball/Makefile Tue Dec 13 16:07:01 2016 (r428506) +++ head/games/pinball/Makefile Tue Dec 13 16:26:19 2016 (r428507) @@ -11,13 +11,15 @@ MAINTAINER= thierry@FreeBSD.org COMMENT= Emilia Pinball is a free pinball game LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool:keepla # .la needed for plugin loading -USE_GL= gl +USES= gmake localbase:ldflags libtool:keepla # .la needed for plugin loading +USE_GL= gl glu GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-debug USE_LDCONFIG= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug +CPPFLAGS+= -DRZR_LIBSTATIC OPTIONS_DEFINE= DOCS @@ -29,13 +31,8 @@ USE_GL+= glu .else USE_SDL= image mixer sdl .endif - -CPPFLAGS+= -I${LOCALBASE}/include -DRZR_LIBSTATIC -LDFLAGS+= -L${LOCALBASE}/lib #MAKE_JOBS_UNSAFE= yes -DOCS= README - # For gmake>=3.82 pre-configure: @${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \ @@ -49,9 +46,7 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pinball/lib*.so* post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for FILE in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} -.endfor + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Added: head/games/pinball/files/patch-base_Config.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pinball/files/patch-base_Config.cpp Tue Dec 13 16:26:19 2016 (r428507) @@ -0,0 +1,13 @@ +--- base/Config.cpp.orig 2003-11-21 07:59:09 UTC ++++ base/Config.cpp +@@ -423,8 +423,8 @@ void Config::setPaths(char const * const + m_sDataDir = string(EM_DATADIR) + "/"; + m_sExeDir = "./"; + if ( *( m_sDataDir.c_str() ) != '/' ) { +- char* ptr=0; +- char* ptrw = 0; ++ const char* ptr=0; ++ const char* ptrw = 0; + //cout<<"relative to exe file"<<endl; + ptr = (strrchr(argv0,'/')); // unix /cygwin / check win32 + #ifdef WIN32
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612131626.uBDGQKi3011461>