svn commit: r469896 - in head/emulators/frodo: . files

[Dirk Meyer]

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 at 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