6 files changed, 77 insertions, 14 deletions

diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 6d5f952a34c5..8ca346b6a6b5 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -19,9 +19,16 @@ RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+USE_REINPLACE=	yes
+
 MAKE_ENV=	PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}
 
+pre-patch:
+	${CP} ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile
 post-patch:
-	${CP} ${WRKSRC}/Makefile.ULTRIX ${WRKSRC}/Makefile
+	${FIND} ${WRKSRC} -name "*.[ch]xx" -exec \
+	  ${REINPLACE_CMD} -e 's/iostream\.h/iostream/; s/fstream\.h/fstream/' \{\} \;
+	${FIND} ${WRKSRC} -name Makefile -exec \
+	  ${REINPLACE_CMD} -e 's/make/$(MAKE)/' \{\} \;
 
 .include <bsd.port.mk>
diff --git a/emulators/bsvc/files/patch-ae b/emulators/bsvc/files/patch-ae
deleted file mode 100644
index 57aa6d54817a..000000000000
--- a/emulators/bsvc/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.ULTRIX.orig	Sun Nov  8 22:39:28 1998
-+++ Makefile.ULTRIX	Mon Sep  6 19:12:20 1999
-@@ -10,7 +10,7 @@
- CXX = g++
- 
- ## C and C++ compiler flags
--CCFLAGS = -O
-+CCFLAGS ?= -O
- CXXFLAGS = -O -ansi -D_G_NO_EXTERN_TEMPLATES
- 
- ## System Includes
diff --git a/emulators/bsvc/files/patch-src-Framework-Tools.hxx b/emulators/bsvc/files/patch-src-Framework-Tools.hxx
new file mode 100644
index 000000000000..4d0c20565b9e
--- /dev/null
+++ b/emulators/bsvc/files/patch-src-Framework-Tools.hxx
@@ -0,0 +1,10 @@
+--- 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 --git a/emulators/bsvc/files/patch-src-Makefile b/emulators/bsvc/files/patch-src-Makefile
new file mode 100644
index 000000000000..6806cd074234
--- /dev/null
+++ b/emulators/bsvc/files/patch-src-Makefile
@@ -0,0 +1,19 @@
+--- 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 --git a/emulators/bsvc/files/patch-ad b/emulators/bsvc/files/patch-src-Makefile.common
index 6c920d2beb78..0f0dade21e93 100644
--- a/emulators/bsvc/files/patch-ad
+++ b/emulators/bsvc/files/patch-src-Makefile.common
@@ -1,5 +1,5 @@
---- Makefile.common.orig	Sun Nov  8 22:39:28 1998
-+++ Makefile.common	Mon Sep  6 21:43:02 1999
+--- Makefile.common.orig	Mon Nov  9 04:39:28 1998
++++ Makefile.common	Sun Nov  3 12:07:21 2002
 @@ -12,14 +12,14 @@
  ###############################################################################
  
@@ -26,3 +26,30 @@
  	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 --git a/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx b/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx
new file mode 100644
index 000000000000..394b07dd1cdd
--- /dev/null
+++ b/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx
@@ -0,0 +1,11 @@
+--- 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);