Attachment 208180 Details for Bug 241135 – Patch from current emulators/bsvc to latest. Note that many files are deleted.

[patch] Patch from current emulators/bsvc to latest. Note that many files are deleted.

bsvc.patch (text/plain), 17.61 KB, created by Dan Cross on 2019-10-08 19:25:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Cross

Created: 2019-10-08 19:25:15 UTC

Size: 17.61 KB

patch

obsolete

>diff -ruN bsvc.orig/Makefile bsvc/Makefile
>--- bsvc.orig/Makefile	2016-07-20 15:33:20.000000000 +0000
>+++ bsvc/Makefile	2019-10-08 18:57:11.037225000 +0000
>@@ -1,39 +1,22 @@
> # Created by: tenser@spitfire.ecsel.psu.edu
>-# $FreeBSD: head/emulators/bsvc/Makefile 418840 2016-07-20 15:33:20Z mat $
>+# $FreeBSD: $
> 
> PORTNAME=	bsvc
>-PORTVERSION=	2.1
>-PORTREVISION=	3
>-CATEGORIES=	emulators tk
>-MASTER_SITES=	SUNSITE/system/emulators
>-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
>+DISTVERSION=	2.4.3
>+CATEGORIES=     emulators tk
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Extensible hardware simulation framework with MC68K support
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	BSVC
>+GH_PROJECT=	bsvc
>+DISTVERSIONPREFIX=	v
> 
>-WRKSRC=		${WRKDIR}/${DISTNAME}/src
>-MAKE_ENV=	PROJECT_BASE=${STAGEDIR}${PREFIX} WRKSRC=${WRKSRC} WISH=${WISH}
>+WRKSRC_SUBDIR=	src
>+MAKEFILE=	Makefile.BSD
>+MAKE_ARGS+=	PREFIX=${PREFIX} WISH=wish${TK_VER}
> 
>-USES=		tk
>-MAKE_JOBS_UNSAFE=	yes
>+MAINTAINER=	cross@gajendra.net
>+COMMENT=	Extensible hardware simulation framework with MC68K support
> 
>-pre-patch:
>-	@${CP} ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile
>-
>-post-patch:
>-
>-.for cfile in codegen.c listing.c object.c main.c
>-	@${REINPLACE_CMD} -e 's|exit()|exit(1)|g' ${WRKSRC}/Assemblers/68kasm/${cfile}
>-.endfor
>-	@${REINPLACE_CMD} -e 's|^#endif.*$$|#endif|g' \
>-		${WRKSRC}/Assemblers/68kasm/instlookup.c
>-
>-	@${FIND} ${WRKSRC} -name "*.[ch]xx" -exec \
>-		${REINPLACE_CMD} -e \
>-			's/iostream\.h/iostream/; \
>-			 s/strstream\.h/strstream/; \
>-			 s/fstream\.h/fstream/' \{\} \;
>-	@${FIND} ${WRKSRC} -name Makefile -exec \
>-		${REINPLACE_CMD} -e 's/make/${MAKE}/' \{\} \;
>+USES=		tk gmake
> 
> .include <bsd.port.mk>
>diff -ruN bsvc.orig/distinfo bsvc/distinfo
>--- bsvc.orig/distinfo	2014-01-22 15:30:13.000000000 +0000
>+++ bsvc/distinfo	2019-10-08 18:30:39.000000000 +0000
>@@ -1,2 +1,3 @@
>-SHA256 (bsvc-2.1-src.tar.gz) = 78b925af31cc1a1d76fcb68390ab6aa9bcbcd555032c4fe2641571a29cc444d5
>-SIZE (bsvc-2.1-src.tar.gz) = 629638
>+TIMESTAMP = 1570559439
>+SHA256 (BSVC-bsvc-v2.4.3_GH0.tar.gz) = cf7097fcf6204a9fbedc4e924e2a1576c5950b230ece6027d03dc86c92a83219
>+SIZE (BSVC-bsvc-v2.4.3_GH0.tar.gz) = 607751
>diff -ruN bsvc.orig/files/patch-Assemblers__68kasm__assemble.c bsvc/files/patch-Assemblers__68kasm__assemble.c
>--- bsvc.orig/files/patch-Assemblers__68kasm__assemble.c	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-Assemblers__68kasm__assemble.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,19 +0,0 @@
>---- ./Assemblers/68kasm/assemble.c.orig	1998-11-09 04:39:28.000000000 +0100
>-+++ ./Assemblers/68kasm/assemble.c	2012-08-24 12:34:05.509913887 +0200
>-@@ -62,6 +62,8 @@
>- extern FILE *listFile;		/* Listing file */
>- extern char listFlag;
>- 
>-+void assemble(char *line, int *errorPtr);
>-+
>- 
>- processFile()
>- {
>-@@ -106,6 +108,7 @@
>- }
>- 
>- 
>-+void
>- assemble(line, errorPtr)
>- char *line;
>- int *errorPtr;
>diff -ruN bsvc.orig/files/patch-Assemblers__68kasm__build.c bsvc/files/patch-Assemblers__68kasm__build.c
>--- bsvc.orig/files/patch-Assemblers__68kasm__build.c	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-Assemblers__68kasm__build.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,18 +0,0 @@
>---- ./Assemblers/68kasm/build.c.orig	1998-11-09 04:39:28.000000000 +0100
>-+++ ./Assemblers/68kasm/build.c	2012-08-24 12:31:42.849913226 +0200
>-@@ -58,6 +58,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- move(mask, size, source, dest, errorPtr)
>- int mask, size;
>- opDescriptor *source, *dest;
>-@@ -216,6 +217,7 @@
>-  ***********************************************************************/
>- 
>- 
>-+void
>- immedInst(mask, size, source, dest, errorPtr)
>- int mask, size;
>- opDescriptor *source, *dest;
>diff -ruN bsvc.orig/files/patch-Assemblers__68kasm__directive.c bsvc/files/patch-Assemblers__68kasm__directive.c
>--- bsvc.orig/files/patch-Assemblers__68kasm__directive.c	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-Assemblers__68kasm__directive.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,50 +0,0 @@
>---- ./Assemblers/68kasm/directive.c.orig	1998-11-09 04:39:28.000000000 +0100
>-+++ ./Assemblers/68kasm/directive.c	2012-08-24 12:30:34.710913465 +0200
>-@@ -53,6 +53,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- org(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>-@@ -115,6 +116,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- equ(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>-@@ -157,6 +159,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- set(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>-@@ -210,6 +213,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- dc(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>-@@ -319,6 +323,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- dcb(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>-@@ -385,6 +390,7 @@
>-  *
>-  ***********************************************************************/
>- 
>-+void
>- ds(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>diff -ruN bsvc.orig/files/patch-Assemblers__68kasm__listing.c bsvc/files/patch-Assemblers__68kasm__listing.c
>--- bsvc.orig/files/patch-Assemblers__68kasm__listing.c	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-Assemblers__68kasm__listing.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- ./Assemblers/68kasm/listing.c.orig	2012-08-24 12:25:01.061915000 +0200
>-+++ ./Assemblers/68kasm/listing.c	2012-08-24 12:32:19.960913679 +0200
>-@@ -108,6 +108,7 @@
>- }
>- 
>- 
>-+void
>- listObj(data, size)
>- int data, size;
>- {
>diff -ruN bsvc.orig/files/patch-Assemblers__68kasm__movem.c bsvc/files/patch-Assemblers__68kasm__movem.c
>--- bsvc.orig/files/patch-Assemblers__68kasm__movem.c	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-Assemblers__68kasm__movem.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,18 +0,0 @@
>---- ./Assemblers/68kasm/movem.c.orig	1998-11-09 04:39:28.000000000 +0100
>-+++ ./Assemblers/68kasm/movem.c	2012-08-24 12:28:10.639913796 +0200
>-@@ -62,6 +62,7 @@
>- char *evalList();
>- 
>- 
>-+void
>- movem(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>-@@ -167,6 +168,7 @@
>- }
>- 
>- 
>-+void
>- reg(size, label, op, errorPtr)
>- int size;
>- char *label, *op;
>diff -ruN bsvc.orig/files/patch-Tools__xtermpipe__xtermpipe.cxx bsvc/files/patch-Tools__xtermpipe__xtermpipe.cxx
>--- bsvc.orig/files/patch-Tools__xtermpipe__xtermpipe.cxx	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-Tools__xtermpipe__xtermpipe.cxx	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- ./Tools/xtermpipe/xtermpipe.cxx.orig	2012-08-24 12:25:01.293914000 +0200
>-+++ ./Tools/xtermpipe/xtermpipe.cxx	2012-08-24 12:35:23.714913382 +0200
>-@@ -40,6 +40,7 @@
>-     return(1);
>- }
>- 
>-+int
>- main()
>- {
>-   int read_id, write_id;
>diff -ruN bsvc.orig/files/patch-Tools__xtermpipe__xtermpipe.cxx_2 bsvc/files/patch-Tools__xtermpipe__xtermpipe.cxx_2
>--- bsvc.orig/files/patch-Tools__xtermpipe__xtermpipe.cxx_2	2014-07-28 18:39:29.000000000 +0000
>+++ bsvc/files/patch-Tools__xtermpipe__xtermpipe.cxx_2	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- Tools/xtermpipe/xtermpipe.cxx.orig	Mon Nov  9 12:39:28 1998
>-+++ Tools/xtermpipe/xtermpipe.cxx	Sat Feb 12 11:02:02 2000
>-@@ -31,7 +31,7 @@
>-     select(pipe_id + 1, (int*)&readfds, (int*)&writefds, (int*)&exceptfds,
>-            (void*)0);
>- # else
>--    select(pipe_id + 1, &readfds, &writefds, &exceptfds, (void*)0);
>-+    select(pipe_id + 1, &readfds, &writefds, &exceptfds, (struct timeval*)0);
>- # endif
>- 
>-   if(FD_ISSET(0, &readfds))
>diff -ruN bsvc.orig/files/patch-UI__Makefile bsvc/files/patch-UI__Makefile
>--- bsvc.orig/files/patch-UI__Makefile	2014-07-28 18:39:29.000000000 +0000
>+++ bsvc/files/patch-UI__Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,48 +0,0 @@
>---- UI/Makefile.orig	1998-11-09 04:39:29.000000000 +0100
>-+++ UI/Makefile	2013-11-05 17:30:19.000000000 +0100
>-@@ -20,31 +20,31 @@
>- 	echo '# export TCL_LIBRARY TK_LIBRARY' >> bsvc
>- 	echo 'ARGS=$$*' >> bsvc
>- 	echo 'export ARGS' >> bsvc
>--	echo 'exec $(WISH) -f $(INSTALL_DIR)/UI/bsvc.tk' >> bsvc
>-+	echo 'exec $(WISH) -f $(PREFIX)/lib/bsvc/bsvc.tk' >> bsvc
>- 	chmod +x bsvc
>- 
>- bsvc.tk: Makefile
>- 	echo '#!$(WISH) -f' > bsvc.tk
>--	echo 'set Program(InstallDir) $(INSTALL_DIR)' >> bsvc.tk
>--	echo 'set Program(BitmapDir) $$Program(InstallDir)/UI/bitmaps' >> bsvc.tk
>--	echo 'set Program(HelpDir) $$Program(InstallDir)/UI/help' >> bsvc.tk
>--	echo 'set Program(LibDir) $$Program(InstallDir)/UI' >> bsvc.tk
>-+	echo 'set Program(InstallDir) $(PREFIX)' >> bsvc.tk
>-+	echo 'set Program(BitmapDir) $(PREFIX)/lib/bsvc/bitmaps' >> bsvc.tk
>-+	echo 'set Program(HelpDir) $(PREFIX)/lib/bsvc/help' >> bsvc.tk
>-+	echo 'set Program(LibDir) $(PREFIX)/lib/bsvc' >> bsvc.tk
>- 	echo 'set Program(WWWBrowser) "$(WWW_BROWSER)"' >> bsvc.tk
>- 	echo 'set Program(WWWHomePage) "$(WWW_HOME_PAGE)"' >> bsvc.tk
>- 	echo 'set Program(StopIndicator) C:\\BSVC\\bin\\STOP' >> bsvc.tk
>- 	echo 'if {$$tcl_version >= 7.5 && $$tcl_platform(platform) == "windows"} {' >> bsvc.tk
>--	echo '  option readfile $$Program(InstallDir)/UI/bsvc.win 40' >> bsvc.tk
>-+	echo '  option readfile $(PREFIX)/lib/bsvc/bsvc.win 40' >> bsvc.tk
>- 	echo '} else {' >> bsvc.tk
>--	echo '  option readfile $$Program(InstallDir)/UI/bsvc.ad 40' >> bsvc.tk
>-+	echo '  option readfile $(PREFIX)/lib/bsvc/bsvc.ad 40' >> bsvc.tk
>- 	echo '}' >> bsvc.tk
>--	echo 'source $$Program(InstallDir)/UI/main.tk' >> bsvc.tk
>-+	echo 'source $(PREFIX)/lib/bsvc/main.tk' >> bsvc.tk
>- 
>- install: bsvc bsvc.tk
>--	$(MKDIR) $(INSTALL_DIR)/UI
>--	$(MKDIR) $(INSTALL_DIR)/UI/bitmaps
>--	$(MKDIR) $(INSTALL_DIR)/UI/help
>--	$(INSTALL) *.tk *.ad $(INSTALL_DIR)/UI
>--	$(INSTALL) bitmaps/* $(INSTALL_DIR)/UI/bitmaps
>--	$(INSTALL) help/* $(INSTALL_DIR)/UI/help
>-+	$(MKDIR) $(PROJECT_BASE)/lib/bsvc
>-+	$(MKDIR) $(PROJECT_BASE)/lib/bsvc/bitmaps
>-+	$(MKDIR) $(PROJECT_BASE)/lib/bsvc/help
>-+	$(INSTALL) *.tk *.ad $(PROJECT_BASE)/lib/bsvc
>-+	$(INSTALL) bitmaps/* $(PROJECT_BASE)/lib/bsvc/bitmaps
>-+	$(INSTALL) help/* $(PROJECT_BASE)/lib/bsvc/help
>- 	$(INSTALL) bsvc $(INSTALL_DIR)
>- 
>diff -ruN bsvc.orig/files/patch-sim68000__main.cxx bsvc/files/patch-sim68000__main.cxx
>--- bsvc.orig/files/patch-sim68000__main.cxx	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-sim68000__main.cxx	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- ./sim68000/main.cxx.orig	2012-08-24 12:25:03.072914000 +0200
>-+++ ./sim68000/main.cxx	2012-08-24 12:37:47.584914549 +0200
>-@@ -19,6 +19,7 @@
>- #include "devices/DeviceRegistry.hxx"
>- #include "loader/Loader.hxx"
>- 
>-+int
>- main()
>- {
>-   BasicCPU& processor = *(new m68000);
>diff -ruN bsvc.orig/files/patch-sim68300__cpu__Makefile bsvc/files/patch-sim68300__cpu__Makefile
>--- bsvc.orig/files/patch-sim68300__cpu__Makefile	2014-07-28 18:39:29.000000000 +0000
>+++ bsvc/files/patch-sim68300__cpu__Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- sim68000/cpu/Makefile.orig	Mon Sep  6 21:46:13 1999
>-+++ sim68000/cpu/Makefile	Mon Sep  6 21:46:36 1999
>-@@ -28,7 +28,7 @@
>- 	$(CC) $(INCLUDES) -o instruction instruction.c
>- 
>- m68000DecodeTable.hxx: instruction instruction.list
>--	$(PROJECT_BASE)/src/sim68000/cpu/instruction  
>-+	$(WRKSRC)/sim68000/cpu/instruction  
>- 
>- clean:
>- 	rm -f *.o $(LIBRARY) instruction
>diff -ruN bsvc.orig/files/patch-sim68360__cpu__Makefile bsvc/files/patch-sim68360__cpu__Makefile
>--- bsvc.orig/files/patch-sim68360__cpu__Makefile	2014-07-28 18:39:29.000000000 +0000
>+++ bsvc/files/patch-sim68360__cpu__Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- sim68360/cpu/Makefile.orig	Mon Sep  6 21:47:20 1999
>-+++ sim68360/cpu/Makefile	Mon Sep  6 21:47:39 1999
>-@@ -31,7 +31,7 @@
>- 	$(CC) $(INCLUDES) -o instruction instruction.c
>- 
>- cpu32DecodeTable.hxx: instruction instruction.list
>--	$(PROJECT_BASE)/src/sim68360/cpu/instruction  
>-+	$(WRKSRC)/sim68360/cpu/instruction  
>- 
>- clean:
>- 	rm -f *.o $(LIBRARY) instruction
>diff -ruN bsvc.orig/files/patch-sim68360__main.cxx bsvc/files/patch-sim68360__main.cxx
>--- bsvc.orig/files/patch-sim68360__main.cxx	2012-08-24 10:48:09.000000000 +0000
>+++ bsvc/files/patch-sim68360__main.cxx	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- ./sim68360/main.cxx.orig	2012-08-24 12:25:01.322915000 +0200
>-+++ ./sim68360/main.cxx	2012-08-24 12:40:04.506914092 +0200
>-@@ -22,6 +22,7 @@
>- #include "devices/DeviceRegistry.hxx"
>- #include "loader/Loader.hxx"
>- 
>-+int
>- main()
>- {
>-   BasicCPU& processor = *(new cpu32);
>diff -ruN bsvc.orig/files/patch-src-Framework-Tools.hxx bsvc/files/patch-src-Framework-Tools.hxx
>--- bsvc.orig/files/patch-src-Framework-Tools.hxx	2014-01-22 17:40:44.000000000 +0000
>+++ bsvc/files/patch-src-Framework-Tools.hxx	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- Framework/Tools.hxx.orig	Sun Nov  3 12:12:32 2002
>-+++ Framework/Tools.hxx	Sun Nov  3 12:13:28 2002
>-@@ -18,6 +18,7 @@
>- #define TOOLS_HXX
>- 
>- #include <string>
>-+#include <ctype.h>
>- 
>- #ifdef USE_STD
>-   using namespace std;
>diff -ruN bsvc.orig/files/patch-src-Makefile bsvc/files/patch-src-Makefile
>--- bsvc.orig/files/patch-src-Makefile	2014-01-22 17:40:44.000000000 +0000
>+++ bsvc/files/patch-src-Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -1,19 +0,0 @@
>---- Makefile.orig	Sun Nov  3 13:08:10 2002
>-+++ Makefile	Sun Nov  3 13:08:55 2002
>-@@ -6,12 +6,12 @@
>- ###############################################################################
>- 
>- ## C and C++ compiler to use
>--CC = gcc
>--CXX = g++
>-+CC ?= gcc
>-+CXX ?= g++
>- 
>- ## C and C++ compiler flags
>--CCFLAGS = -O
>--CXXFLAGS = -O -ansi -Wall -D_G_NO_EXTERN_TEMPLATES
>-+CCFLAGS = $(CFLAGS)
>-+CXXFLAGS += -ansi -D_G_NO_EXTERN_TEMPLATES -DUSE_STD
>- 
>- ## System Includes
>- SYS_INCLUDES =
>diff -ruN bsvc.orig/files/patch-src-Makefile.common bsvc/files/patch-src-Makefile.common
>--- bsvc.orig/files/patch-src-Makefile.common	2013-11-05 16:32:57.000000000 +0000
>+++ bsvc/files/patch-src-Makefile.common	1970-01-01 00:00:00.000000000 +0000
>@@ -1,55 +0,0 @@
>---- Makefile.common.orig	Mon Nov  9 04:39:28 1998
>-+++ Makefile.common	Sun Nov  3 12:07:21 2002
>-@@ -12,14 +12,14 @@
>- ###############################################################################
>- 
>- ## Base Directory of the BSVC distribution
>--PROJECT_BASE = /home/bwmott/projects/bsvc/development/bsvc
>-+PROJECT_BASE? = /home/bwmott/projects/bsvc/development/bsvc
>- 
>- ## Directory to install the BSVC system
>- INSTALL_DIR = $(PROJECT_BASE)/bin
>- 
>- ## Name or path and Name of the Tcl/Tk "wish" executable
>- #WISH        = /usr/bin/wish
>--WISH         = wish
>-+WISH         ?= wish8.4
>- 
>- ## Name of WWW Browser and URL of the BSVC Home Page (or blank)
>- WWW_BROWSER   = 
>-@@ -37,7 +37,7 @@
>- ######################### END OF CONFIGURATION ################################
>- 
>- INDEPENDENT_PARMS = PROJECT_BASE='$(PROJECT_BASE)' WISH='$(WISH)' \
>--	INCLUDES='-I$(PROJECT_BASE)/src/Framework $(SYS_INCLUDE)' \
>-+	INCLUDES='-I$(WRKSRC)/Framework $(SYS_INCLUDE)' \
>- 	LIBS='$(SYS_LIBS)' INSTALL_DIR='$(INSTALL_DIR)' \
>- 	WWW_BROWSER='$(WWW_BROWSER)' WWW_HOME_PAGE='$(WWW_HOME_PAGE)'
>- 
>-@@ -51,7 +51,7 @@
>- 		echo ""; \
>- 		echo "------ Building: $$dir"; \
>- 		cd $$dir; \
>--		make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \
>-+		$(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \
>- 		if [ $$? -eq 0 ] ; \
>- 		then \
>- 			cd ..; \
>-@@ -67,7 +67,7 @@
>- 		echo ""; \
>- 		echo "------ Installing: $$dir"; \
>- 		cd $$dir; \
>--		make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" install; \
>-+		$(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" install; \
>- 		if [ $$? -eq 0 ] ; \
>- 		then \
>- 			cd ..; \
>-@@ -82,7 +82,7 @@
>- 		echo ""; \
>- 		echo "------ Cleaning: $$dir"; \
>- 		cd $$dir; \
>--		make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \
>-+		$(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \
>- 		if [ $$? -eq 0 ] ; \
>- 		then \
>- 			cd ..; \
>diff -ruN bsvc.orig/files/patch-src-sim68360-loader-Loader.cxx bsvc/files/patch-src-sim68360-loader-Loader.cxx
>--- bsvc.orig/files/patch-src-sim68360-loader-Loader.cxx	2014-01-22 17:40:44.000000000 +0000
>+++ bsvc/files/patch-src-sim68360-loader-Loader.cxx	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- sim68360/loader/Loader.cxx.orig	Sun Nov  3 12:25:40 2002
>-+++ sim68360/loader/Loader.cxx	Sun Nov  3 12:25:52 2002
>-@@ -26,7 +26,7 @@
>-   string error;
>- 
>-   // Open the file for reading
>--  #ifdef WIN32
>-+  #ifdef USE_STD
>-     fstream file(filename, ios::in);
>-   #else
>-     fstream file(filename, ios::in | ios::nocreate);
>diff -ruN bsvc.orig/pkg-descr bsvc/pkg-descr
>--- bsvc.orig/pkg-descr	2014-01-22 15:44:51.000000000 +0000
>+++ bsvc/pkg-descr	2019-10-08 18:46:44.000000000 +0000
>@@ -1,4 +1,4 @@
> BSVC is an extensible simulator framework for microprocessor
> design and testing.  It comes with a simulator and assembler
>-for the Motorola MC68k family of microprocessors, and supplies
>-a graphical user interface for simulation runs.
>+for the Motorola MC68k family of microprocessors, and provides
>+a graphical user interface.
>diff -ruN bsvc.orig/pkg-plist bsvc/pkg-plist
>--- bsvc.orig/pkg-plist	2014-10-27 12:24:22.000000000 +0000
>+++ bsvc/pkg-plist	1970-01-01 00:00:00.000000000 +0000
>@@ -1,30 +0,0 @@
>-bin/68kasm
>-bin/xtermpipe
>-bin/bsvc
>-bin/sim68000
>-bin/sim68360
>-lib/bsvc/bitmaps/Down.xbm
>-lib/bsvc/bitmaps/bsvc.gif
>-lib/bsvc/bitmaps/bspin.gif
>-lib/bsvc/bitmaps/wait2.xbm
>-lib/bsvc/bitmaps/wait1.xbm
>-lib/bsvc/bitmaps/wait0.xbm
>-lib/bsvc/bitmaps/wait.xbm
>-lib/bsvc/bitmaps/memicon.xbm
>-lib/bsvc/bitmaps/listicon.xbm
>-lib/bsvc/bitmaps/bsvcicon.xbm
>-lib/bsvc/bitmaps/Up.xbm
>-lib/bsvc/bitmaps/PageUp.xbm
>-lib/bsvc/bitmaps/PageDown.xbm
>-lib/bsvc/bitmaps/wait3.xbm
>-lib/bsvc/help/license
>-lib/bsvc/BtkFile.tk
>-lib/bsvc/tools.tk
>-lib/bsvc/memory.tk
>-lib/bsvc/main.tk
>-lib/bsvc/listing.tk
>-lib/bsvc/license.tk
>-lib/bsvc/device.tk
>-lib/bsvc/bsvc.tk
>-lib/bsvc/breakpt.tk
>-lib/bsvc/bsvc.ad

Actions: View | Diff

Attachments on bug 241135: 208180 | 208327 | 208531