From owner-freebsd-ports Sun Nov 3 4:40:15 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BAFC37B404 for ; Sun, 3 Nov 2002 04:40:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB97143E88 for ; Sun, 3 Nov 2002 04:40:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gA3Ce1x3018375 for ; Sun, 3 Nov 2002 04:40:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gA3Ce15Z018374; Sun, 3 Nov 2002 04:40:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F4FF37B401 for ; Sun, 3 Nov 2002 04:37:51 -0800 (PST) Received: from lambda.foldr.org (lambda.foldr.org [198.78.66.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8513543E6E for ; Sun, 3 Nov 2002 04:37:45 -0800 (PST) (envelope-from vs@foldr.org) Received: from theater.dyndns.org (p3EE20266.dip.t-dialin.net [62.226.2.102]) by lambda.foldr.org (8.12.3/8.11.6) with ESMTP id gA3CbSjN041770 (using TLSv1/SSLv3 with cipher EDH-RSA-DES-CBC3-SHA (168 bits) verified OK) for ; Sun, 3 Nov 2002 13:37:30 +0100 (CET) (envelope-from vs@foldr.org) Received: from monster.ikea.net (monster.ikea.net [10.0.0.3]) by theater.dyndns.org (8.12.5/8.12.5) with ESMTP id gA3CbTWV003176 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK) for ; Sun, 3 Nov 2002 13:37:30 +0100 (CET) (envelope-from vs@monster.ikea.net) Received: (from vs@localhost) by monster.ikea.net (8.12.6/8.12.6/Submit) id gA3CbOxf025829; Sun, 3 Nov 2002 13:37:24 +0100 (CET) (envelope-from vs) Message-Id: <200211031237.gA3CbOxf025829@monster.ikea.net> Date: Sun, 3 Nov 2002 13:37:24 +0100 (CET) From: Volker Stolz Reply-To: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/44852: [patch] emulators/bsvc fixes for bento Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 44852 >Category: ports >Synopsis: [patch] emulators/bsvc fixes for bento >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Nov 03 04:40:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 5.0-CURRENT i386 >Organization: Lambda Core Research Facility >Environment: System: FreeBSD monster.ikea.net 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sat Oct 26 17:47:39 CEST 2002 root@monster.ikea.net:/usr/obj/usr/src/sys/MONSTER i386 >Description: Generic fixes for GCC3: - Mangle fstream.h & iostream.h to avoid warnings - Fix $CFLAGS & $MAKE - -DUSE_STD for GCC3 - Correct oversight in sim68360/loader/Loader.cxx - Include missing header for tolower() Tested on: -CURRENT, 4.6-STABLE >How-To-Repeat: >Fix: Removed files: - patch-ad - patch-ae --- Makefile.orig Sun Nov 3 12:33:37 2002 +++ Makefile Sun Nov 3 13:16:51 2002 @@ -19,9 +19,16 @@ 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 diff -urN ofiles/patch-ad files/patch-ad --- ofiles/patch-ad Sun Nov 3 13:20:32 2002 +++ files/patch-ad Thu Jan 1 01:00:00 1970 @@ -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)' - diff -urN ofiles/patch-ae files/patch-ae --- ofiles/patch-ae Sun Nov 3 13:20:33 2002 +++ files/patch-ae Thu Jan 1 01:00:00 1970 @@ -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 -urN ofiles/patch-src-Framework-Tools.hxx files/patch-src-Framework-Tools.hxx --- ofiles/patch-src-Framework-Tools.hxx Thu Jan 1 01:00:00 1970 +++ files/patch-src-Framework-Tools.hxx Sun Nov 3 12:38:57 2002 @@ -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 ++#include + + #ifdef USE_STD + using namespace std; diff -urN ofiles/patch-src-Makefile files/patch-src-Makefile --- ofiles/patch-src-Makefile Thu Jan 1 01:00:00 1970 +++ files/patch-src-Makefile Sun Nov 3 13:09:05 2002 @@ -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 -urN ofiles/patch-src-Makefile.common files/patch-src-Makefile.common --- ofiles/patch-src-Makefile.common Thu Jan 1 01:00:00 1970 +++ files/patch-src-Makefile.common Sun Nov 3 12:39:19 2002 @@ -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 ..; \ diff -urN ofiles/patch-src-sim68360-loader-Loader.cxx files/patch-src-sim68360-loader-Loader.cxx --- ofiles/patch-src-sim68360-loader-Loader.cxx Thu Jan 1 01:00:00 1970 +++ files/patch-src-sim68360-loader-Loader.cxx Sun Nov 3 12:39:34 2002 @@ -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); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message