Attachment #26254 for bug #44852

View | Details | Raw Unified | Return to bug 44852
Collapse All | Expand All

Lines 19-27 Link Here

(-)Makefile (-1 / +8 lines)
19		19
20	WRKSRC= ${WRKDIR}/${DISTNAME}/src	20	WRKSRC= ${WRKDIR}/${DISTNAME}/src
21		21
		22	USE_REINPLACE= yes
		23
22	MAKE_ENV= PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}	24	MAKE_ENV= PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}
23		25
		26	pre-patch:
		27	${CP} ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile
24	post-patch:	28	post-patch:
25	${CP} ${WRKSRC}/Makefile.ULTRIX ${WRKSRC}/Makefile	29	${FIND} ${WRKSRC} -name "*.[ch]xx" -exec \
		30	${REINPLACE_CMD} -e 's/iostream\.h/iostream/; s/fstream\.h/fstream/' \{\} \;
		31	${FIND} ${WRKSRC} -name Makefile -exec \
		32	${REINPLACE_CMD} -e 's/make/$(MAKE)/' \{\} \;
26		33
27	.include <bsd.port.mk>	34	.include <bsd.port.mk>




--- 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)'
 

Lines 1-11 Link Here

(-)files/patch-ae (-11 lines)
1	--- Makefile.ULTRIX.orig Sun Nov 8 22:39:28 1998
2	+++ Makefile.ULTRIX Mon Sep 6 19:12:20 1999
3	@@ -10,7 +10,7 @@
4	CXX = g++
5
6	## C and C++ compiler flags
7	-CCFLAGS = -O
8	+CCFLAGS ?= -O
9	CXXFLAGS = -O -ansi -D_G_NO_EXTERN_TEMPLATES
10
11	## System Includes

Line 0 Link Here

(-)files/patch-src-Framework-Tools.hxx (+10 lines)
	1	--- Framework/Tools.hxx.orig Sun Nov 3 12:12:32 2002
	2	+++ Framework/Tools.hxx Sun Nov 3 12:13:28 2002
	3	@@ -18,6 +18,7 @@
	4	#define TOOLS_HXX
	5
	6	#include <string>
	7	+#include <ctype.h>
	8
	9	#ifdef USE_STD
	10	using namespace std;




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




--- 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 ..; \

Line 0 Link Here

(-)files/patch-src-sim68360-loader-Loader.cxx (+11 lines)
	1	--- sim68360/loader/Loader.cxx.orig Sun Nov 3 12:25:40 2002
	2	+++ sim68360/loader/Loader.cxx Sun Nov 3 12:25:52 2002
	3	@@ -26,7 +26,7 @@
	4	string error;
	5
	6	// Open the file for reading
	7	- #ifdef WIN32
	8	+ #ifdef USE_STD
	9	fstream file(filename, ios::in);
	10	#else
	11	fstream file(filename, ios::in \| ios::nocreate);

Return to bug 44852

Lines 1-28 Link Here

(-)files/patch-ad (-28 lines)
1	--- Makefile.common.orig Sun Nov 8 22:39:28 1998
2	+++ Makefile.common Mon Sep 6 21:43:02 1999
3	@@ -12,14 +12,14 @@
4	###############################################################################
5
6	## Base Directory of the BSVC distribution
7	-PROJECT_BASE = /home/bwmott/projects/bsvc/development/bsvc
8	+PROJECT_BASE? = /home/bwmott/projects/bsvc/development/bsvc
9
10	## Directory to install the BSVC system
11	INSTALL_DIR = $(PROJECT_BASE)/bin
12
13	## Name or path and Name of the Tcl/Tk "wish" executable
14	#WISH = /usr/bin/wish
15	-WISH = wish
16	+WISH = wish8.2
17
18	## Name of WWW Browser and URL of the BSVC Home Page (or blank)
19	WWW_BROWSER =
20	@@ -37,7 +37,7 @@
21	######################### END OF CONFIGURATION ################################
22
23	INDEPENDENT_PARMS = PROJECT_BASE='$(PROJECT_BASE)' WISH='$(WISH)' \
24	- INCLUDES='-I$(PROJECT_BASE)/src/Framework $(SYS_INCLUDE)' \
25	+ INCLUDES='-I$(WRKSRC)/Framework $(SYS_INCLUDE)' \
26	LIBS='$(SYS_LIBS)' INSTALL_DIR='$(INSTALL_DIR)' \
27	WWW_BROWSER='$(WWW_BROWSER)' WWW_HOME_PAGE='$(WWW_HOME_PAGE)'
28

Line 0 Link Here

(-)files/patch-src-Makefile (+19 lines)
	1	--- Makefile.orig Sun Nov 3 13:08:10 2002
	2	+++ Makefile Sun Nov 3 13:08:55 2002
	3	@@ -6,12 +6,12 @@
	4	###############################################################################
	5
	6	## C and C++ compiler to use
	7	-CC = gcc
	8	-CXX = g++
	9	+CC ?= gcc
	10	+CXX ?= g++
	11
	12	## C and C++ compiler flags
	13	-CCFLAGS = -O
	14	-CXXFLAGS = -O -ansi -Wall -D_G_NO_EXTERN_TEMPLATES
	15	+CCFLAGS = $(CFLAGS)
	16	+CXXFLAGS += -ansi -D_G_NO_EXTERN_TEMPLATES -DUSE_STD
	17
	18	## System Includes
	19	SYS_INCLUDES =

Line 0 Link Here

(-)files/patch-src-Makefile.common (+55 lines)
	1	--- Makefile.common.orig Mon Nov 9 04:39:28 1998
	2	+++ Makefile.common Sun Nov 3 12:07:21 2002
	3	@@ -12,14 +12,14 @@
	4	###############################################################################
	5
	6	## Base Directory of the BSVC distribution
	7	-PROJECT_BASE = /home/bwmott/projects/bsvc/development/bsvc
	8	+PROJECT_BASE? = /home/bwmott/projects/bsvc/development/bsvc
	9
	10	## Directory to install the BSVC system
	11	INSTALL_DIR = $(PROJECT_BASE)/bin
	12
	13	## Name or path and Name of the Tcl/Tk "wish" executable
	14	#WISH = /usr/bin/wish
	15	-WISH = wish
	16	+WISH = wish8.2
	17
	18	## Name of WWW Browser and URL of the BSVC Home Page (or blank)
	19	WWW_BROWSER =
	20	@@ -37,7 +37,7 @@
	21	######################### END OF CONFIGURATION ################################
	22
	23	INDEPENDENT_PARMS = PROJECT_BASE='$(PROJECT_BASE)' WISH='$(WISH)' \
	24	- INCLUDES='-I$(PROJECT_BASE)/src/Framework $(SYS_INCLUDE)' \
	25	+ INCLUDES='-I$(WRKSRC)/Framework $(SYS_INCLUDE)' \
	26	LIBS='$(SYS_LIBS)' INSTALL_DIR='$(INSTALL_DIR)' \
	27	WWW_BROWSER='$(WWW_BROWSER)' WWW_HOME_PAGE='$(WWW_HOME_PAGE)'
	28
	29	@@ -51,7 +51,7 @@
	30	echo ""; \
	31	echo "------ Building: $$dir"; \
	32	cd $$dir; \
	33	- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \
	34	+ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \
	35	if [ $$? -eq 0 ] ; \
	36	then \
	37	cd ..; \
	38	@@ -67,7 +67,7 @@
	39	echo ""; \
	40	echo "------ Installing: $$dir"; \
	41	cd $$dir; \
	42	- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" install; \
	43	+ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" install; \
	44	if [ $$? -eq 0 ] ; \
	45	then \
	46	cd ..; \
	47	@@ -82,7 +82,7 @@
	48	echo ""; \
	49	echo "------ Cleaning: $$dir"; \
	50	cd $$dir; \
	51	- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \
	52	+ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \
	53	if [ $$? -eq 0 ] ; \
	54	then \
	55	cd ..; \