Index: head/emulators/frodo/Makefile =================================================================== --- head/emulators/frodo/Makefile (revision 469895) +++ head/emulators/frodo/Makefile (revision 469896) @@ -1,59 +1,61 @@ # $FreeBSD$ PORTNAME= frodo PORTVERSION= 4.1b PORTREVISION= 11 CATEGORIES= emulators tk MASTER_SITES= http://frodo.cebix.net/downloads/ DISTNAME= FrodoV4_1b.Src MAINTAINER= dinoex@FreeBSD.org COMMENT= Emulates a Commodore 64 -BROKEN_FreeBSD_12= Regression C++ - USES= shebangfix tk:run +USE_CXXSTD= gnu++98 +CXXFLAGS+= -std=gnu++98 USE_XORG= x11 xt xext sm ice +GNU_CONFIGURE= yes +CONFIGURE_ENV= CXXFLAGS='${CXXFLAGS}' +MAKE_ENV= LDFLAGS='${LDFLAGS}' ALL_TARGET= Frodo INSTALL_WRKSRC= ${WRKDIR}/Frodo-4.1b -WRKSRC= ${INSTALL_WRKSRC}/Src -GNU_CONFIGURE= yes SHEBANG_FILES= ../TkGui.tcl +WRKSRC= ${INSTALL_WRKSRC}/Src ROM= 1541 Basic Char Kernal OPTIONS_DEFINE= SDL DOCS OPTIONS_DEFAULT=SDL .include .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl .endif pre-configure: ${REINPLACE_CMD} -e 's|wish|wish${TK_VER}|' \ ${WRKSRC}/C64_x.i do-install: ${SED} -e 's=\$${PREFIX}=${PREFIX}=g' \ < ${FILESDIR}/frodo > ${WRKDIR}/frodo ${INSTALL_SCRIPT} ${WRKDIR}/frodo ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/frodo ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/Frodo ${STAGEDIR}${PREFIX}/libexec/frodo/ .for i in ${ROM} ${INSTALL_DATA} "${INSTALL_WRKSRC}/${i} ROM" ${STAGEDIR}${PREFIX}/libexec/frodo/ .endfor ${INSTALL_DATA} "${INSTALL_WRKSRC}/Frodo Logo" ${STAGEDIR}${PREFIX}/libexec/frodo/ ${INSTALL_SCRIPT} "${INSTALL_WRKSRC}/TkGui.tcl" ${STAGEDIR}${PREFIX}/libexec/frodo/ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/frodo/64prgs ${TAR} -C ${INSTALL_WRKSRC}/64prgs -cf - . | \ ${TAR} -C ${STAGEDIR}${PREFIX}/libexec/frodo/64prgs -xf - do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}/ ${TAR} -C ${INSTALL_WRKSRC}/Docs -cf - . | \ ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - .include Index: head/emulators/frodo/files/patch-Makefile.in =================================================================== --- head/emulators/frodo/files/patch-Makefile.in (nonexistent) +++ head/emulators/frodo/files/patch-Makefile.in (revision 469896) @@ -0,0 +1,23 @@ +--- Makefile.in.orig 2002-01-02 16:44:04 UTC ++++ Makefile.in +@@ -9,6 +9,7 @@ REVISION = 1 + CXX = @CXX@ + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@ ++CXXFLAGS = @CXXFLAGS@ @CFLAGS@ -I./ -DFRODO_HPUX_REV=@HPUX_REV@ -DKBD_LANG=@KBD_LANG@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -62,10 +63,10 @@ depend dep: + makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null + + .cpp.o: +- $(CC) $(INCLUDES) $(CFLAGS) -o $@ -c $*.cpp ++ $(CC) $(INCLUDES) $(CXXFLAGS) -o $@ -c $*.cpp + + .cpp.s: +- $(CC) $(INCLUDES) $(CFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0 ++ $(CC) $(INCLUDES) $(CXXFLAGS) $(EXTRAFLAGS) -o $@ -S $*.cpp -g0 + + C64_PC.o: C64.cpp C64.h C64_x.i CmdPipe.h CPUC64.h CPU1541.h VIC.h SID.h CIA.h REU.h IEC.h 1541job.h Display.h Prefs.h + $(CC) $(INCLUDES) $(CFLAGS) $(PCFLAGS) -o $@ -c $*.cpp Property changes on: head/emulators/frodo/files/patch-Makefile.in ___________________________________________________________________ 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