Date: Wed, 30 Oct 2013 07:18:51 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332083 - in head/emulators/jzintv: . files Message-ID: <201310300718.r9U7IpRO058757@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Wed Oct 30 07:18:50 2013 New Revision: 332083 URL: http://svnweb.freebsd.org/changeset/ports/332083 Log: - Enable staging - Update USES - Fix build on Clang Added: head/emulators/jzintv/files/patch-src-imasm-parser.cpp (contents, props changed) Modified: head/emulators/jzintv/Makefile Modified: head/emulators/jzintv/Makefile ============================================================================== --- head/emulators/jzintv/Makefile Wed Oct 30 07:16:48 2013 (r332082) +++ head/emulators/jzintv/Makefile Wed Oct 30 07:18:50 2013 (r332083) @@ -3,6 +3,7 @@ PORTNAME= jzintv PORTVERSION= 1.0b4 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://spatula-city.org/~im14u2c/intv/dl/ DISTFILES= ${PORTNAME}-1.0-beta4-src${EXTRACT_SUFX} \ @@ -15,7 +16,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/jzintv-1.0-beta4 BUILD_WRKSRC= ${WRKSRC}/src -USE_GMAKE= yes +USES= gmake USE_XORG= x11 xau xdmcp USE_SDL= sdl USE_ZIP= yes @@ -31,7 +32,6 @@ TOOLS= as1600 bin2rom cgc_update crc32 d SUB_FILES= pkg-message -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MTOOLS} @@ -49,21 +49,21 @@ pre-build: ${MKDIR} ${WRKSRC}/rom do-install: - ${MKDIR} ${DATADIR}/rom - ${INSTALL_DATA} ${WRKSRC}/rom/*.rom ${DATADIR}/rom/ - ${INSTALL_PROGRAM} ${WRKSRC}/bin/jzintv ${PREFIX}/bin/jzintv + ${MKDIR} ${STAGEDIR}${DATADIR}/rom + ${INSTALL_DATA} ${WRKSRC}/rom/*.rom ${STAGEDIR}${DATADIR}/rom/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/jzintv ${STAGEDIR}${PREFIX}/bin/jzintv .if ${PORT_OPTIONS:MTOOLS} .for tool in ${TOOLS} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${PREFIX}/bin/jzintv-${tool} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${STAGEDIR}${PREFIX}/bin/jzintv-${tool} .endfor .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/doc - (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc) + ${MKDIR} ${STAGEDIR}${DOCSDIR}/doc + (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/doc) .endif .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR} - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .endif @${CAT} ${PKGMESSAGE} Added: head/emulators/jzintv/files/patch-src-imasm-parser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/jzintv/files/patch-src-imasm-parser.cpp Wed Oct 30 07:18:50 2013 (r332083) @@ -0,0 +1,20 @@ +--- src/imasm/parser.cpp.orig 2010-11-01 07:19:01.000000000 +0100 ++++ src/imasm/parser.cpp 2013-10-29 06:17:34.000000000 +0100 +@@ -65,7 +65,7 @@ + + Parser::~Parser() + { +- map <const char *, macro *>::iterator itr; ++ map<const char *, macro *, Parser_ltstr>::iterator itr; + + for (itr = m_macroMap.begin(); itr != m_macroMap.end(); itr++) + { +@@ -583,7 +583,7 @@ + + macro *Parser::GetMacroPtr(const char *macName) + { +- map <const char *, macro *>::iterator itr; ++ map<const char *, macro *, Parser_ltstr>::iterator itr; + + itr = m_macroMap.find(macName); + return itr == m_macroMap.end() ? NULL : itr->second;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310300718.r9U7IpRO058757>