. Fix the build on 5.x.

Submitted by:	bento via kris

6 files changed, 163 insertions, 41 deletions

diff --git a/editors/bed/Makefile b/editors/bed/Makefile
index b118c4d946f4..5f750b237fb1 100644
--- a/editors/bed/Makefile
+++ b/editors/bed/Makefile
@@ -34,12 +34,6 @@ USE_GMAKE=	yes
 MAN1=		bed.1 xbed.1
 MANCOMPRESSED=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
-.endif
-
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=		X11="@comment "
@@ -63,4 +57,4 @@ post-configure:
 	${ECHO_MSG} 'CONFIG_MMAP=y' >> ${WRKSRC}/config
 	${GMAKE} -C ${WRKSRC} dep
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/bed/files/patch-configure b/editors/bed/files/patch-configure
new file mode 100644
index 000000000000..85619edca72f
--- /dev/null
+++ b/editors/bed/files/patch-configure
@@ -0,0 +1,18 @@
+--- configure.orig	Fri Mar 26 10:58:33 2004
++++ configure	Fri Mar 26 10:59:01 2004
+@@ -5588,6 +5588,7 @@
+ sigset_t set;
+ pid_t pid=getpid();
+ 	printf("Checking for longjump from interrupt more than once... ");
++#ifdef __i386__
+ 	signal(SIGINT,sighand);
+ 	if(sigsetjmp(jmp,2)==4) {
+ 		ret++;
+@@ -5597,6 +5598,7 @@
+ 			}
+ 		}
+ 	kill(pid,SIGINT);
++#endif
+ 	puts("no");
+ 	exit( 4);
+ 	}
diff --git a/editors/bed/files/patch-plugins::examples::Makefile b/editors/bed/files/patch-plugins::examples::Makefile
index 4bce989dbb9d..18d76fb670e5 100644
--- a/editors/bed/files/patch-plugins::examples::Makefile
+++ b/editors/bed/files/patch-plugins::examples::Makefile
@@ -1,7 +1,5 @@
-$FreeBSD$
-
 --- plugins/examples/Makefile.orig	Thu Apr 17 07:52:05 2003
-+++ plugins/examples/Makefile	Fri Jan 30 12:38:20 2004
++++ plugins/examples/Makefile	Fri Mar 26 09:44:31 2004
 @@ -30,12 +30,12 @@
  BIN2BYTE= ../../utils/bin2byte
  PLUGINCFLAGSALL=-DPLUGINSRC=1
@@ -29,15 +27,15 @@ $FreeBSD$
  bitfields.plug: bitfields.o bitcpy.o
  	echo hello
 -	$(GCC) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
-+	$(CC) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
++	$(CXX) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
  	chmod a-x $@
  bitfields.o: bitfields.cc
 -	$(GCC) -DNOEDITOR -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
-+	$(CC) -DNOEDITOR -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
++	$(CXX) -DNOEDITOR -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
  
  bitcontains.plug: bitcontains.o bitcpy.o bitfields.o
 -	$(GCC) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
-+	$(CC) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
++	$(CXX) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
  	chmod a-x $@
  
  
@@ -49,25 +47,25 @@ $FreeBSD$
  
  %.o: %.cpp  $(GENERAL) $(HEADERS) absolute 
 -	$(GCC) $(PLUGINCFLAGS) -DPLUGIN=1 -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
-+	$(CC) $(PLUGINCFLAGS) -DPLUGIN=1 -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
++	$(CXX) $(PLUGINCFLAGS) -DPLUGIN=1 -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
  
  %.o: %.cc $(HEADERS) absolute 
 -	$(GCC) -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
-+	$(CC) -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
++	$(CXX) -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
  
  ifneq ($(CYGWIN),yes)
  XINCL=$(X_CFLAGS)
  endif
  switchsize.o: switchsize.cc $(HEADERS) absolute
 -	$(GCC) $(XINCL) -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
-+	$(CC) $(XINCL) -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
++	$(CXX) $(XINCL) -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
  %.i: %.cc $(HEADERS) absolute
 -	$(GCC)  -DGLOBAL -DUNDER -DPLUGIN $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E -P $< -o $@
-+	$(CC)  -DGLOBAL -DUNDER -DPLUGIN $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E -P $< -o $@
++	$(CXX)  -DGLOBAL -DUNDER -DPLUGIN $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E -P $< -o $@
  
  %.oo: %.cc  $(HEADERS) absolute 
 -	$(GCC)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
-+	$(CC)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
++	$(CXX)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
  
  #bitcontains.oo: bitcontains.oo bitcpy.oo bitfields.oo
  #	ld -o $@ $^   $(LDRELOC)
@@ -76,39 +74,39 @@ $FreeBSD$
  
  %.ooo: %.cc  $(HEADERS) absolute 
 -	$(GCC) -DFAKE_DYNAMIC=1  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
-+	$(CC) -DFAKE_DYNAMIC=1  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
++	$(CXX) -DFAKE_DYNAMIC=1  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
  %.ooo: %.cpp  $(GENERAL) $(HEADERS) absolute
 -	$(GCC) -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
-+	$(CC) -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
++	$(CXX) -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
  %.oo: %.cpp  $(GENERAL) $(HEADERS) absolute
 -	$(GCC) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
-+	$(CC) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
++	$(CXX) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
  
  %.iii: %.cc  $(HEADERS) absolute $(CONFIGFILE)
 -	$(GCC) -P  -DFAKE_DYNAMIC  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
-+	$(CC) -P  -DFAKE_DYNAMIC  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
++	$(CXX) -P  -DFAKE_DYNAMIC  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
  %.iii: %.cpp  $(GENERAL) $(HEADERS) absolute
  	echo hallo
 -	$(GCC) -P -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $(GENERAL) -o $@
 -	$(GCC) -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $*.ooo
-+	$(CC) -P -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $(GENERAL) -o $@
-+	$(CC) -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $*.ooo
++	$(CXX) -P -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $(GENERAL) -o $@
++	$(CXX) -DFAKE_DYNAMIC $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $*.ooo
  
  
  %.ii: %.cc  $(HEADERS) absolute $(CONFIGFILE)
 -	$(GCC)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
 -#	$(GCC) '-Dwill_be_used_to_get_prodefname_in_inlink_h(x,y)=prodefname(x,y)' '-Uwill_be_used_to_get_prodef_in_inlink_h(x)=prodef(x)' -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
 -#	$(GCC) '-Uwill_be_used_to_get_prodefname_in_inlink_h' '-Uwill_be_used_to_get_prodef_in_inlink_h' -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
-+	$(CC)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
-+#	$(CC) '-Dwill_be_used_to_get_prodefname_in_inlink_h(x,y)=prodefname(x,y)' '-Uwill_be_used_to_get_prodef_in_inlink_h(x)=prodef(x)' -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
-+#	$(CC) '-Uwill_be_used_to_get_prodefname_in_inlink_h' '-Uwill_be_used_to_get_prodef_in_inlink_h' -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
++	$(CXX)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
++#	$(CXX) '-Dwill_be_used_to_get_prodefname_in_inlink_h(x,y)=prodefname(x,y)' '-Uwill_be_used_to_get_prodef_in_inlink_h(x)=prodef(x)' -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
++#	$(CXX) '-Uwill_be_used_to_get_prodefname_in_inlink_h' '-Uwill_be_used_to_get_prodef_in_inlink_h' -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $< -o $@
  
  %.ii: %.cpp  $(GENERAL) $(HEADERS) absolute
 -	$(GCC)  -P $(PLUGINCFLAGS)  -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $(GENERAL) -o $@
-+	$(CC)  -P $(PLUGINCFLAGS)  -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $(GENERAL) -o $@
++	$(CXX)  -P $(PLUGINCFLAGS)  -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E $(GENERAL) -o $@
  %.s: %.cpp  $(GENERAL) $(HEADERS) absolute
 -	$(GCC)  $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -S $(GENERAL) -o $@
-+	$(CC)  $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -S $(GENERAL) -o $@
++	$(CXX)  $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -S $(GENERAL) -o $@
  disass-use: disass-use.c absolute
  	$(CC) -g disass-use.c -o disass-use
  absolute: 
@@ -117,7 +115,7 @@ $FreeBSD$
  
  %.i: %.cpp  $(GENERAL) $(HEADERS) absolute
 -	$(GCC) -DPLUGIN $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E -P $(GENERAL) -o $@
-+	$(CC) -DPLUGIN $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E -P $(GENERAL) -o $@
++	$(CXX) -DPLUGIN $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -E -P $(GENERAL) -o $@
  
  clean:
  	-rm *.plug *.o *.oo *.ooo disass-use$(EXEEXT) absolute core ingive *.ii *.i *.iii
@@ -126,17 +124,17 @@ $FreeBSD$
  
  switchsize.plug: switchsize.o
 -	$(GCC) $(PLUGINLDFLAGS) -shared $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
-+	$(CC) $(PLUGINLDFLAGS) -shared $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
++	$(CXX) $(PLUGINLDFLAGS) -shared $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
  	chmod a-x $@
  putselect.plug: putselect.o
 -	$(GCC) $(PLUGINLDFLAGS) -shared $< -o $@  $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
-+	$(CC) $(PLUGINLDFLAGS) -shared $< -o $@  $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
++	$(CXX) $(PLUGINLDFLAGS) -shared $< -o $@  $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
  	chmod a-x $@
  switchsize: switchsize.cc
  	echo $(CYGWIN)
  ifneq ($(CYGWIN),yes)
 -	$(GCC) -g -DTEST  $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
-+	$(CC) -g -DTEST  $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
++	$(CXX) -g -DTEST  $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
  else
 -	$(GCC) -D_WIN32 -g -DTEST  $< -o $@ 
 +	$(CC) -D_WIN32 -g -DTEST  $< -o $@ 
@@ -148,7 +146,7 @@ $FreeBSD$
  	chmod a-x $@
  time: time.cpp
 -	$(GCC) -g -DTEST -DGLOBAL $< -o $@  $(X_LIBS)  -lX11  $(X_EXTRA_LIBS)
-+	$(CC) -g -DTEST -DGLOBAL $< -o $@  $(X_LIBS)  -lX11  $(X_EXTRA_LIBS)
++	$(CXX) -g -DTEST -DGLOBAL $< -o $@  $(X_LIBS)  -lX11  $(X_EXTRA_LIBS)
  
  
  chars.bin: chars.c
@@ -174,7 +172,7 @@ $FreeBSD$
  
  macrotemplate.i: macrotemplate.cpp Makefile 
 -	$(GCC) $(PLUGINLDFLAGS)  -DPLUGIN -E -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $(GENERAL) -o $@
-+	$(CC) $(PLUGINLDFLAGS)  -DPLUGIN -E -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $(GENERAL) -o $@
++	$(CXX) $(PLUGINLDFLAGS)  -DPLUGIN -E -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $(GENERAL) -o $@
  
  places.h: macrotemplate.plug pos
  	echo -n "int macrofunctionpos=" > places.h
@@ -183,10 +181,10 @@ $FreeBSD$
  
  macroplug.o: macroplug.cpp  $(GENERAL) $(HEADERS) absolute places.h $(CONFIGFILE)
 -	$(GCC) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
-+	$(CC) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
++	$(CXX) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
  macroplug.oo: macroplug.cpp  $(GENERAL) $(HEADERS) absolute places.h $(CONFIGFILE)
 -	$(GCC) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
-+	$(CC) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
++	$(CXX) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
  
  ../mainprocedures.h:
  	$(MAKE) -C .. mainprocedures.h
diff --git a/editors/bed/files/patch-plugins::examples::file.cpp b/editors/bed/files/patch-plugins::examples::file.cpp
new file mode 100644
index 000000000000..a9da5b7cf7ee
--- /dev/null
+++ b/editors/bed/files/patch-plugins::examples::file.cpp
@@ -0,0 +1,11 @@
+--- plugins/examples/file.cpp.orig	Fri Mar 26 10:13:48 2004
++++ plugins/examples/file.cpp	Fri Mar 26 10:13:52 2004
+@@ -73,7 +73,7 @@
+ 
+ 
+ #ifdef OLDGCCVARMACRO
+-#define fprintf(x,args...) {message(##args);erefresh();}
++#define fprintf(x,args...) {message(args);erefresh();}
+ #else
+ #define fprintf(x,...) {message(__VA_ARGS__);erefresh();}
+ #endif
diff --git a/editors/bed/files/patch-plugins::examples::title.cc b/editors/bed/files/patch-plugins::examples::title.cc
new file mode 100644
index 000000000000..32e25f5c1d91
--- /dev/null
+++ b/editors/bed/files/patch-plugins::examples::title.cc
@@ -0,0 +1,19 @@
+--- plugins/examples/title.cc.orig	Fri Mar 26 10:30:14 2004
++++ plugins/examples/title.cc	Fri Mar 26 10:31:01 2004
+@@ -66,14 +66,14 @@
+ 		}
+ #endif
+ #ifdef TTYNAME
+-#ifdef HAS_TTYNAME_R
++#if defined(HAS_TTYNAME_R) && !defined(__FreeBSD__)
+ 	char nametty[15];
+ #else
+ 	char *nametty;
+ #endif
+ //	ptsname_r(titlebuf,ttys[i],MAXTITLE-nr);
+ 	if(isatty(STDOUT_FILENO)) {
+-#ifdef HAS_TTYNAME_R
++#if defined(HAS_TTYNAME_R) && !defined(__FreeBSD__)
+ 		if(!ttyname_r(STDOUT_FILENO,nametty,15)) {
+ #else
+ 		if((nametty=ttyname(STDOUT_FILENO))) {
diff --git a/editors/bed/files/patch-src::Makefile b/editors/bed/files/patch-src::Makefile
index cd6f14274cac..2039b8fb2b05 100644
--- a/editors/bed/files/patch-src::Makefile
+++ b/editors/bed/files/patch-src::Makefile
@@ -1,7 +1,5 @@
-$FreeBSD$
-
---- src/Makefile.orig	Wed Jan 28 23:50:02 2004
-+++ src/Makefile	Wed Jan 28 23:51:41 2004
+--- src/Makefile.orig	Mon Apr 21 11:40:57 2003
++++ src/Makefile	Fri Mar 26 09:30:26 2004
 @@ -27,8 +27,8 @@
  
  #-DENDOFLINEBUG
@@ -13,3 +11,87 @@ $FreeBSD$
  CPPFLAGS=$(CFLAGS)
  # *** NORMALLY NOTHING HAS TO BE CHANGED BELOW THIS LINE
  OBJ := repeat.o rbtree.o memory.o editor.o   getfile.o glob.o expandfilename.o readcolors.o  getfree.o getlabel.o  screenpart.o  marks.o digitstring.o   parts.o main.o  strtoint.o  keyproc.o marken.o procview.o menus.o inout.o move.o window.o edit.o file.o select.o undo.o screen.o search.o onlykey.o  editup.o  cursesinit.o input.o contain.o withcontain.o filter.o  ascii.o  multidigit.o macros.o editmacros.o typelist.o $(OBJ) keyinput.o  hassub.o savedatatype.o menufuncs.o support.o desturbe.o gethelp.o disk.o
+@@ -86,7 +86,7 @@
+ 
+ dep: $(PRESRC) ../config Makefile extrakeys.h dataprocer.h dataproc.h procedures.h mainprocedures.h readhelp.cpp  
+ 	$(MAKE) -C ../plugins/examples makeinlinklist
+-	$(GCC) -MM -MG $(CPPFLAGS) $(CFILE) $(CPPFILES) readhelp.cpp > depend
++	$(CXX) -MM -MG $(CPPFLAGS) $(CFILE) $(CPPFILES) readhelp.cpp > depend
+ 
+ empty:
+ 	@echo done
+@@ -103,16 +103,16 @@
+ 	$(PROGCC)  $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ) $(OBJECTS) $(LIBPATH) $(LIBS)
+ 
+ quick:  $(OBJ)  sourcenumber
+-	$(GCC) $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ)  $(OBJECTS) $(LIBPATH) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ)  $(OBJECTS) $(LIBPATH) $(LIBS)
+ sourcenumber: $(SRC)  $(BIN2BYTE)
+ 	bash ./mkversion $(ALLEXCEPTVERSION)
+ md5file: $(SRC)  $(BIN2BYTE)
+ 	bash ./mkversion $(ALLEXCEPTVERSION)
+ 
+ link:  dataprocer.h menufuncs.o procview.o menus.o  $(INLINKLIST) $(ININLINKLIB)
+-	$(GCC) $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ)  $(OBJECTS) $(LIBPATH) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ)  $(OBJECTS) $(LIBPATH) $(LIBS)
+ linkonly:   
+-	$(GCC)  $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ)  $(OBJECTS) $(LIBPATH)  $(LIBS)
++	$(CXX)  $(LDFLAGS) -o $(PROGRAM)  version.o $(OBJ)  $(OBJECTS) $(LIBPATH)  $(LIBS)
+ 
+ lines: 
+ 	-rm screenpart.o editup.o editor.o
+@@ -179,16 +179,16 @@
+ 	-rm depend
+ 
+ version.o: version.cpp sourcenumber md5sums.cpp copy.h help.h  date.c  ../config config.h
+-	$(GCC) $(CFLAGS) -c $<
++	$(CXX) $(CFLAGS) -c $<
+ 
+ digitstring: digitstring.cpp
+ 	$(GCC) -g digitstring.cpp -DTEST -o digitstring 
+ 
+ 
+ %.i:%.cpp
+-	$(GCC) -E -P $(CPPFLAGS) $< -o $@
++	$(CXX) -E -P $(CPPFLAGS) $< -o $@
+ %.s:%.cpp
+-	$(GCC) -S  $(CPPFLAGS) $< -o $@
++	$(CXX) -S  $(CPPFLAGS) $< -o $@
+ %.i:%.c
+ 	$(GCC) -E $(CPPFLAGS) $< -o $@
+ 
+@@ -242,9 +242,9 @@
+ 	echo '/*WARNING automatically generated  from bedrcproc.cpp */' > bedrcproc.h
+ 	grep '^initword' bedrcproc.cpp|sed -e 's/^initword\([^{]*\).*/initword\1/'|$(SORT) -b -t '(' -k 2 >> bedrcproc.h
+ extramenunr$(EXEEXT):menus.cpp editor.h menu.h
+-	$(CC) -DPRINTMAXSHOWMENUS=1 $(CFLAGS) menus.cpp -o extramenunr
++	$(CXX) -DPRINTMAXSHOWMENUS=1 $(CFLAGS) menus.cpp -o extramenunr
+ extramenunr.i:menus.cpp editor.h menu.h
+-	$(CC) -E -P -DPRINTMAXSHOWMENUS=1 $(CFLAGS) menus.cpp -o extramenunr.i
++	$(CXX) -E -P -DPRINTMAXSHOWMENUS=1 $(CFLAGS) menus.cpp -o extramenunr.i
+ mkmenus.h: extramenunr$(EXEEXT)
+ #	extramenus=`./extramenunr`; for ((i=0;$$i<$$extramenus;i=$$[$$i+1])); do echo  "mkmenunum($$i)";done >mkmenus.h
+ 	extramenus=`./extramenunr`;i=0; while test $$i -lt $$extramenus; do echo  "mkmenunum($$i)";i=$$[$$i+1];done >mkmenus.h
+@@ -255,11 +255,11 @@
+ 	echo $(EXEPROGRAMS)
+ 
+ Bed:   
+-	$(GCC) $(LDFLAGS) -o Bed  version.o $(OBJ)  $(OBJECTS)  $(ININLINKLIB) $(LIBPATH) /home/jka/self/projects/c/bedall/libs/libc.so.6 /home/jka/self/projects/c/bedall/libs/libpthread.so.0 /home/jka/self/projects/c/bedall/libs/libdl.so.2  /home/jka/self/projects/c/bedall/libs/libm.so.6  /home/jka/self/projects/c/bedall/libs/libncurses.so.4   /home/jka/self/projects/c/bedall/libs/ld-linux.so.2
++	$(CXX) $(LDFLAGS) -o Bed  version.o $(OBJ)  $(OBJECTS)  $(ININLINKLIB) $(LIBPATH) /home/jka/self/projects/c/bedall/libs/libc.so.6 /home/jka/self/projects/c/bedall/libs/libpthread.so.0 /home/jka/self/projects/c/bedall/libs/libdl.so.2  /home/jka/self/projects/c/bedall/libs/libm.so.6  /home/jka/self/projects/c/bedall/libs/libncurses.so.4   /home/jka/self/projects/c/bedall/libs/ld-linux.so.2
+ 
+ 
+ beds:   
+-	$(GCC) $(LDFLAGS) -o $(PROGRAM)s  version.o $(OBJ) $(OBJECTS) $(LIBPATH) $(LIBS) -L/usr/X11R6/lib -lX11
++	$(CXX) $(LDFLAGS) -o $(PROGRAM)s  version.o $(OBJ) $(OBJECTS) $(LIBPATH) $(LIBS) -L/usr/X11R6/lib -lX11
+ 
+ readhelp.o: readhelp.cpp procedures.h
+ 
+@@ -281,7 +281,7 @@
+ chhelp: addmenu
+ 	./addmenu > chhelp
+ addmenu: addmenu.cpp menu.h
+-	$(GCC) addmenu.cpp -o addmenu
++	$(CXX) addmenu.cpp -o addmenu
+ showopts:
+ 	echo OPTS: $(OPTS)
+ 	echo CFLAGS: $(CFLAGS)