From owner-svn-ports-all@freebsd.org Mon May 14 14:56:49 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 011FFDF3CF4; Mon, 14 May 2018 14:56:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7EA1D6F259; Mon, 14 May 2018 14:56:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 608791D990; Mon, 14 May 2018 14:56:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EEumHd069382; Mon, 14 May 2018 14:56:48 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EEumf2069380; Mon, 14 May 2018 14:56:48 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201805141456.w4EEumf2069380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Mon, 14 May 2018 14:56:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469896 - in head/emulators/frodo: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/emulators/frodo: . files X-SVN-Commit-Revision: 469896 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 14:56:49 -0000 Author: dinoex Date: Mon May 14 14:56:47 2018 New Revision: 469896 URL: https://svnweb.freebsd.org/changeset/ports/469896 Log: - fix build for FreeBSD 12.0 Added: head/emulators/frodo/files/patch-Makefile.in (contents, props changed) Modified: head/emulators/frodo/Makefile Modified: head/emulators/frodo/Makefile ============================================================================== --- head/emulators/frodo/Makefile Mon May 14 14:24:13 2018 (r469895) +++ head/emulators/frodo/Makefile Mon May 14 14:56:47 2018 (r469896) @@ -10,15 +10,17 @@ 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 Added: head/emulators/frodo/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/frodo/files/patch-Makefile.in Mon May 14 14:56:47 2018 (r469896) @@ -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