Index: head/emulators/bsvc/Makefile
===================================================================
--- head/emulators/bsvc/Makefile	(revision 70981)
+++ head/emulators/bsvc/Makefile	(revision 70982)
@@ -1,27 +1,34 @@
 # New ports collection Makefile for:	bsvc
 # Date created:		03-Mar-1997
 # Whom:			tenser@spitfire.ecsel.psu.edu
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bsvc
 PORTVERSION=	2.1
 CATEGORIES=	emulators tk82
 MASTER_SITES=	ftp://ftp.redlinelabs.com/pub/bsvc/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/emulators
 DISTFILES=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
 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>

Property changes on: head/emulators/bsvc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/emulators/bsvc/files/patch-ad
===================================================================
--- head/emulators/bsvc/files/patch-ad	(revision 70981)
+++ head/emulators/bsvc/files/patch-ad	(nonexistent)
@@ -1,28 +0,0 @@
---- Makefile.common.orig	Sun Nov  8 22:39:28 1998
-+++ Makefile.common	Mon Sep  6 21:43:02 1999
-@@ -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.2
- 
- ## 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)'
- 

Property changes on: head/emulators/bsvc/files/patch-ad
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/emulators/bsvc/files/patch-ae
===================================================================
--- head/emulators/bsvc/files/patch-ae	(revision 70981)
+++ head/emulators/bsvc/files/patch-ae	(nonexistent)
@@ -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

Property changes on: head/emulators/bsvc/files/patch-ae
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/emulators/bsvc/files/patch-src-Framework-Tools.hxx
===================================================================
--- head/emulators/bsvc/files/patch-src-Framework-Tools.hxx	(nonexistent)
+++ head/emulators/bsvc/files/patch-src-Framework-Tools.hxx	(revision 70982)
@@ -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;

Property changes on: head/emulators/bsvc/files/patch-src-Framework-Tools.hxx
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/emulators/bsvc/files/patch-src-Makefile
===================================================================
--- head/emulators/bsvc/files/patch-src-Makefile	(nonexistent)
+++ head/emulators/bsvc/files/patch-src-Makefile	(revision 70982)
@@ -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 =

Property changes on: head/emulators/bsvc/files/patch-src-Makefile
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/emulators/bsvc/files/patch-src-Makefile.common
===================================================================
--- head/emulators/bsvc/files/patch-src-Makefile.common	(nonexistent)
+++ head/emulators/bsvc/files/patch-src-Makefile.common	(revision 70982)
@@ -0,0 +1,55 @@
+--- 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.2
+ 
+ ## 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 ..; \

Property changes on: head/emulators/bsvc/files/patch-src-Makefile.common
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx
===================================================================
--- head/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx	(nonexistent)
+++ head/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx	(revision 70982)
@@ -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);

Property changes on: head/emulators/bsvc/files/patch-src-sim68360-loader-Loader.cxx
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property