- Update to version 0.2.23.

- Rewrite check of 'menubar' feature in x11/rxvt when X11 option is enabled.
- Add dep to ALL_TARGET instead of running ${GMAKE} in post-configure.
- Add OPTIONS.
- Remove BROKEN for amd64 (builds).
- Remove BROKEN for ia64 (let's see what happens now).
- Add WWW line to pkg-descr.
- Added typedef hacks (has a bug that doesn't allow default arguments in
  function pointers, and also doesn't allow arrays of function pointers) to
  allow building with GCC > 2.95 (the problems are known, though).

15 files changed, 315 insertions, 457 deletions

diff --git a/editors/bed/Makefile b/editors/bed/Makefile
index f7458d490c3b..90dce9d7b6d8 100644
--- a/editors/bed/Makefile
+++ b/editors/bed/Makefile
@@ -6,67 +6,57 @@
 #
 
 PORTNAME=	bed
-PORTVERSION=	0.2.19
-PORTREVISION=	2
+PORTVERSION=	0.2.23
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		http://bedlinux.tripod.com/download/
-MASTER_SITE_SUBDIR=	apps/editors/terminal
+MASTER_SITES=	http://bedlinux.tripod.com/download/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Variable dataformat binary editor
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-# Cannot guarantee rxvt will have menubar enabled on bento.
-.if defined(PACKAGE_BUILDING)
-WITHOUT_X11=	yes
-.endif
-
-.if !defined(WITHOUT_X11)
-PATCH_DEPENDS+=	${X11BASE}/bin/rxvt:${PORTSDIR}/x11/rxvt
-RUN_DEPENDS+=	${X11BASE}/bin/rxvt:${PORTSDIR}/x11/rxvt
-.endif
-
-GNU_CONFIGURE=	yes
-USE_GCC=	2.95
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+ALL_TARGET=	dep all
+
+OPTIONS=	X11 "Enable X11 support" on
 
 MAN1=		bed.1 xbed.1
 MANCOMPRESSED=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-BROKEN=		"Does not compile on amd64 (missing -fPIC)"
+.if !defined(WITHOUT_X11)
+PATCH_DEPENDS+=	rxvt:${PORTSDIR}/x11/rxvt
 .endif
 
-.if ${ARCH} == "ia64"
-BROKEN=		"Hangs during configure"
+# Check for menubar support in "x11/rxvt". In case of failure, disable X11 if
+# BATCH or PACKAGE_BUILDING, and IGNORE otherwise.
+.if !defined(WITHOUT_X11)
+. if exists(${X11BASE}/bin/rxvt)
+MENUBAR_TEST!=	rxvt -h 2>&1 | ${GREP} -i menubar || ${TRUE}
+.  if empty(MENUBAR_TEST)
+.   if defined(BATCH) || defined(PACKAGE_BUILDING)
+WITHOUT_X11=	yes
+.   else
+IGNORE=		needs "x11/rxvt" to be compiled with the WITH_MENUBAR option to enable X11 support
+.   endif
+.  endif
+. endif
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	X11="@comment "
-.else
+.if !defined(WITHOUT_X11)
+RUN_DEPENDS+=	rxvt:${PORTSDIR}/x11/rxvt
 PLIST_SUB+=	X11=""
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-pre-configure:
-	@if "${X11BASE}/bin/rxvt" -h 2>&1 | ${GREP} -qi menubar; then \
-	else \
-		${ECHO_MSG} "${PORTSDIR}/x11/rxvt must be compiled with the option"; \
-		${ECHO_MSG} "	WITH_MENUBAR=yes"; \
-		${ECHO_MSG} "to enable X11 support."; \
-		exit 1; \
-	fi
-.endif
+.else
+PLIST_SUB+=	X11="@comment "
+CONFIGURE_ARGS+=--without-x
 .endif
 
 post-configure:
-	${ECHO_MSG} 'CONFIG_DEBUG=n' >> ${WRKSRC}/config
-	${ECHO_MSG} 'CONFIG_MMAP=y' >> ${WRKSRC}/config
-	${GMAKE} -C ${WRKSRC} dep
+	@${ECHO_CMD} 'CONFIG_DEBUG=n' >> ${WRKSRC}/config
+	@${ECHO_CMD} 'CONFIG_MMAP=y' >> ${WRKSRC}/config
+	@${ECHO_CMD} 'GCC=${CC}' >> ${WRKSRC}/config
 
 .include <bsd.port.post.mk>
diff --git a/editors/bed/distinfo b/editors/bed/distinfo
index d83064888814..5a7c1bf5a700 100644
--- a/editors/bed/distinfo
+++ b/editors/bed/distinfo
@@ -1,3 +1,3 @@
-MD5 (bed-0.2.19.src.tar.gz) = 96d340c164f220d303b986d5d68d8008
-SHA256 (bed-0.2.19.src.tar.gz) = 36e3b116e84bf69e4f41905f4385d43d847627c0ea98012e50773331d4b18d80
-SIZE (bed-0.2.19.src.tar.gz) = 618658
+MD5 (bed-0.2.23.src.tar.gz) = 4fafdf0b30622c7f849b68d22e74cde2
+SHA256 (bed-0.2.23.src.tar.gz) = 3a83a1eb8db1f9cc668e5862d539c329d99a8bc840f863f519fe05769540049d
+SIZE (bed-0.2.23.src.tar.gz) = 570961
diff --git a/editors/bed/files/patch-Makefile b/editors/bed/files/patch-Makefile
index 330126ff8589..7c3dae1d3a2f 100644
--- a/editors/bed/files/patch-Makefile
+++ b/editors/bed/files/patch-Makefile
@@ -1,8 +1,6 @@
-$FreeBSD$
-
---- Makefile.orig	Fri Apr 18 14:45:51 2003
-+++ Makefile	Thu Jan 22 10:21:03 2004
-@@ -57,7 +57,7 @@
+--- Makefile.orig	Fri Jul  9 08:01:08 2004
++++ Makefile	Tue Jan  2 00:25:53 2007
+@@ -50,7 +50,7 @@
  	-mv  $(ROOTDIR)$(CONFDIRLINK) $(CONFDIRLINK).bak
  	-$(MKDIR) $(ROOTDIR)$(CONFDIR)
  ifneq ($(CYGWIN),yes)
@@ -11,34 +9,20 @@ $FreeBSD$
  	-mv  $(ROOTDIR)$(CONFDIR)/$(CONFFILE) $(ROOTDIR)$(CONFDIR)/~$(CONFFILE)
  endif
  	$(CP) $(CONFFILE) $(ROOTDIR)$(CONFDIR)
-@@ -102,17 +102,17 @@
+@@ -95,10 +95,10 @@
  	cp public.key $(ROOTDIR)$(CONFDIR)
  ifeq ($(HAS_FILE),y)
  	$(CP) testmarks.bedm bedmagic addmagic.sh $(ROOTDIR)$(CONFDIR)
 -	@bash ./addmagic.sh
 +#	@bash ./addmagic.sh
  endif
--	 mkdir -p $(ROOTDIR)$(KDEMENU)/$(XBEDMENU);
--	cp progman/x$(XMENUNAME).kdelnk $(ROOTDIR)$(KDEMENU)/$(XBEDMENU)/$(XMENUNAME).kdelnk;
--	mkdir -p $(ROOTDIR)$(KDEMENU)/$(BEDMENU);
--	cp progman/c$(MENUNAME).kdelnk $(ROOTDIR)$(KDEMENU)/$(BEDMENU)/$(MENUNAME).kdelnk; 
-+#	 mkdir -p $(ROOTDIR)$(KDEMENU)/$(XBEDMENU);
-+#	cp progman/x$(XMENUNAME).kdelnk $(ROOTDIR)$(KDEMENU)/$(XBEDMENU)/$(XMENUNAME).kdelnk;
-+#	mkdir -p $(ROOTDIR)$(KDEMENU)/$(BEDMENU);
-+#	cp progman/c$(MENUNAME).kdelnk $(ROOTDIR)$(KDEMENU)/$(BEDMENU)/$(MENUNAME).kdelnk; 
- 
--	mkdir -p $(ROOTDIR)$(GNOMEMENU)/$(XBEDMENU);
--	cp progman/x$(XMENUNAME).desktop $(ROOTDIR)$(GNOMEMENU)/$(XBEDMENU)/$(XMENUNAME).desktop ; 
--	mkdir -p $(ROOTDIR)$(GNOMEMENU)/$(BEDMENU);
--	cp progman/c$(MENUNAME).desktop $(ROOTDIR)$(GNOMEMENU)/$(BEDMENU)/$(MENUNAME).desktop ;
-+#	mkdir -p $(ROOTDIR)$(GNOMEMENU)/$(XBEDMENU);
-+#	cp progman/x$(XMENUNAME).desktop $(ROOTDIR)$(GNOMEMENU)/$(XBEDMENU)/$(XMENUNAME).desktop ; 
-+#	mkdir -p $(ROOTDIR)$(GNOMEMENU)/$(BEDMENU);
-+#	cp progman/c$(MENUNAME).desktop $(ROOTDIR)$(GNOMEMENU)/$(BEDMENU)/$(MENUNAME).desktop ;
+ ifneq ($(HAS_APPLICATIONS),)
+-	cp progman/bed-binary-editor.desktop $(ROOTDIR)$(HAS_APPLICATIONS)/bed-binary-editor.desktop 
++#	cp progman/bed-binary-editor.desktop $(ROOTDIR)$(HAS_APPLICATIONS)/bed-binary-editor.desktop 
+ endif
  ifeq ($(CONFIG_PROGMAN),y)
  #	cp bed.xpm $(ROOTDIR)$(ICONPATH)
- #	cp bedsmall.xpm $(ROOTDIR)$(ICONPATH)/mini/bed.xpm
-@@ -127,7 +127,7 @@
+@@ -114,7 +114,7 @@
  ifeq ($(ROOTDIR),)
  	@cp uninstallhead $(ROOTDIR)$(CONFDIR)/uninstallbed.sh
  	@FILES=`for afile in $(ROOTDIR)$(BINDIST); do  test -e $$afile&&echo $$afile ;done`; find  $$FILES ! -type d -print |xargs echo $(REMOVE) ' ' >> $(ROOTDIR)$(CONFDIR)/uninstallbed.sh ;find  $$FILES -type d  -a  -print |$(SORT) -r|xargs echo $(RMDIR) ' ' >> $(ROOTDIR)$(CONFDIR)/uninstallbed.sh
diff --git a/editors/bed/files/patch-keyconfig.cpp b/editors/bed/files/patch-keyconfig.cpp
deleted file mode 100644
index 976d7eeffed9..000000000000
--- a/editors/bed/files/patch-keyconfig.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/keyconfig.cpp.orig	Thu May 23 14:28:24 2002
-+++ src/keyconfig.cpp	Tue Dec 16 10:46:21 2003
-@@ -46,16 +46,16 @@
- 	char *proc;
- 	};
- 
--#define elk(x,y,z) ((struct keydef) {y,#z})
--#define sym(x) (struct keydef) {x,x}
-+#define elk(x,y,z) {y,#z}
-+#define sym(x) {x,x}
- #define	LINE {NULL,NULL}
--#define two(name,proc) ((struct keydef) {name,#proc})
-+#define two(name,proc) {name,#proc}
- #define elm(x,z) LINE
- //#define elm(x,z)
- //#define	LINE 
- #include "varmacro.h"
- #ifdef OLDGCCVARMACRO
--#define menumake(file,name,els...)		,##els VARMACRO
-+#define menumake(file,name,els...)		,els VARMACRO
- #else
- #define menumake(file,name,...)		,__VA_ARGS__
- #endif
diff --git a/editors/bed/files/patch-plugins::examples::Makefile b/editors/bed/files/patch-plugins::examples::Makefile
index 18d76fb670e5..e54e1c1002c2 100644
--- a/editors/bed/files/patch-plugins::examples::Makefile
+++ b/editors/bed/files/patch-plugins::examples::Makefile
@@ -1,6 +1,6 @@
---- plugins/examples/Makefile.orig	Thu Apr 17 07:52:05 2003
-+++ plugins/examples/Makefile	Fri Mar 26 09:44:31 2004
-@@ -30,12 +30,12 @@
+--- plugins/examples/Makefile.orig	Mon Mar  1 07:11:28 2004
++++ plugins/examples/Makefile	Tue Jan  2 10:51:04 2007
+@@ -35,12 +35,12 @@
  BIN2BYTE= ../../utils/bin2byte
  PLUGINCFLAGSALL=-DPLUGINSRC=1
  ifeq ($(CONFIG_DEBUG),n)
@@ -17,178 +17,16 @@
  
  else
  PLUGINCFLAGS= $(CFLAGS) $(OPTS) -g $(PLUGINCFLAGSALL)
-@@ -150,41 +150,41 @@
- ##define callname(name,proc)  int (Editor::*for_procedures_h_##proc##_prodefname)(void)=&Editor::proc;char name_part_##proc##_end[]=name;
- #../../src/inlink.h: $(INLINKIN)  $(CONFIGFILE) 
- #	sed  '{s/^[ 	]*call([ 	]*\([^),; 	.*/\\]*\)[ 	]*)/prodef(\1)/p; s/^[ 	]*callname([ 	]*\([^),; 	.*/\\]*\)[ 	]*)/prodefname(\1)/p; s/^.*//p; }' $(INLINKSRC) >  $@
--#	$(GCC) $(PLUGINCFLAGS) -DPLUGIN -x c   -E -P -D"call(x)=uniekvoorinlinkhprodef(x)" -D"callname(name,x)=uniekvoorinlinkhprodefname(name,x)"   $(INLINKSRC)> tussengegs
-+#	$(CC) $(PLUGINCFLAGS) -DPLUGIN -x c   -E -P -D"call(x)=uniekvoorinlinkhprodef(x)" -D"callname(name,x)=uniekvoorinlinkhprodefname(name,x)"   $(INLINKSRC)> tussengegs
- 
- bitfields.plug: bitfields.o bitcpy.o
- 	echo hello
--	$(GCC) $(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 $@
-+	$(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 $@ 
-+	$(CXX) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
- 	chmod a-x $@
- 
- 
- %.plug: %.o
--	$(GCC) $(PLUGINLDFLAGS) -shared $< -o $@
-+	$(CC) $(PLUGINLDFLAGS) -shared $< -o $@
- 	chmod a-x $@
- 	rm $<
- 
- %.o: %.cpp  $(GENERAL) $(HEADERS) absolute 
--	$(GCC) $(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 $@
-+	$(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 $@
-+	$(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 $@
-+	$(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 $@
-+	$(CXX)  -DGLOBAL -DUNDER $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@
- 
- #bitcontains.oo: bitcontains.oo bitcpy.oo bitfields.oo
- #	ld -o $@ $^   $(LDRELOC)
-@@ -194,29 +194,29 @@
- 
- 
- %.ooo: %.cc  $(HEADERS) absolute 
--	$(GCC) -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 $@
-+	$(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 $@
-+	$(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 $@
-+	$(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
-+	$(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 $@
-+	$(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 $@
-+	$(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 $@
-+	$(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: 
-@@ -232,7 +232,7 @@
- #	$(MAKE) -C  $(EXAMPLEDIR) disass.plug
- 
- %.i: %.cpp  $(GENERAL) $(HEADERS) absolute
--	$(GCC) -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
-@@ -247,24 +247,24 @@
+@@ -49,7 +49,7 @@
  endif
- 
- switchsize.plug: switchsize.o
--	$(GCC) $(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)
-+	$(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)
-+	$(CXX) -g -DTEST  $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
- else
--	$(GCC) -D_WIN32 -g -DTEST  $< -o $@ 
-+	$(CC) -D_WIN32 -g -DTEST  $< -o $@ 
  endif
- 
- disass.plug: disass.o disass-use
--	$(GCC) $(PLUGINLDFLAGS) -shared $< -o $@
-+	$(CC) $(PLUGINLDFLAGS) -shared $< -o $@
- 	chmod a-x $@
- time: time.cpp
--	$(GCC) -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
-@@ -292,20 +292,20 @@
- MACRODATA=12345678BeginMacroKeyStrokes
- MACROFLAGS=-DMACROFUNCTION=\"$(MACROFUNCTION)\" -DMACRODATA=\"$(MACRODATA)\"
- #macrotemplate.plug: macrotemplate.cpp Makefile ./fsize $(CONFIGFILE)
--#	$(GCC) $(PLUGINLDFLAGS) -DPLUGIN -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $(GENERAL) -o $@
-+#	$(CC) $(PLUGINLDFLAGS) -DPLUGIN -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $(GENERAL) -o $@
- 
- #macrotemplate.o: macrotemplate.cc Makefile ./fsize $(CONFIGFILE)
--#	$(GCC)  -DGLOBAL -DUNDER $(MACROFLAGS) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@ 
-+#	$(CC)  -DGLOBAL -DUNDER $(MACROFLAGS) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $< -o $@ 
- #macrotemplate.plug: macrotemplate.o
- #	ld -shared  $< -o $@
- macrotemplate.plug: macrotemplate.cc Makefile ./fsize $(CONFIGFILE)
--	$(GCC) -shared -DGLOBAL -DUNDER $(MACROFLAGS) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $< -o $@
-+	$(CC) -shared -DGLOBAL -DUNDER $(MACROFLAGS) $(PLUGINCFLAGS) -DPLUGIN -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\"  $< -o $@
-  
--#	$(GCC) $(PLUGINLDFLAGS) -DPLUGIN -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" $< -o $@
-+#	$(CC) $(PLUGINLDFLAGS) -DPLUGIN -shared $(MACROFLAGS) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" $< -o $@
- 
- 
- macrotemplate.i: macrotemplate.cpp Makefile 
--	$(GCC) $(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
-@@ -317,9 +317,9 @@
- 
- 
- macroplug.o: macroplug.cpp  $(GENERAL) $(HEADERS) absolute places.h $(CONFIGFILE)
--	$(GCC) $(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 $@
-+	$(CXX) $(PLUGINCFLAGS) -DEXAMPLEDIR=\"`cat absolute`\" -DSOURCEFILENAME=\"examples/$<\" -c $(GENERAL) -o $@
- 
- ../mainprocedures.h:
- 	$(MAKE) -C .. mainprocedures.h
-@@ -327,14 +327,14 @@
+ #BEDSRCDIR=\"../../src\"
+-PLUGINCFLAGS := -I../ -I../../src/ -I../../src/empty  $(X_CFLAGS)   $(PLUGINCFLAGS) -DNEWTERM     -DBEDSRCDIR=$(BEDSRCDIR)
++PLUGINCFLAGS := -I../ -I../../src/ -I../../src/empty  $(X_CFLAGS)   $(PLUGINCFLAGS) -DNEWTERM     -DBEDSRCDIR=$(BEDSRCDIR) -fPIC
+ #PLUGINCFLAGS=-g
+ #PLUGINLDFLAGS=-s -O6
+ #PLUGINLDFLAGS= -O6
+@@ -339,14 +339,14 @@
  plughelp: mkhelp 
  	./mkhelp > plughelp
  mkhelp: mkhelp.h mkhelp.c
diff --git a/editors/bed/files/patch-plugins__examples__bitflags.cc b/editors/bed/files/patch-plugins__examples__bitflags.cc
new file mode 100644
index 000000000000..f12bcb8d6241
--- /dev/null
+++ b/editors/bed/files/patch-plugins__examples__bitflags.cc
@@ -0,0 +1,55 @@
+--- plugins/examples/bitflags.cc.orig	Thu Apr 17 09:16:56 2003
++++ plugins/examples/bitflags.cc	Mon Jan  1 23:58:08 2007
+@@ -76,8 +76,8 @@
+ 			else
+ 				betweenflags=NULL;
+ 	
+-			table=new (char*)[maxtable];
+-			lens=new (char)[maxtable];
++			table=new char*[maxtable];
++			lens=new char[maxtable];
+ 			
+ 			memcpy(lens,fl.lens,insidetable*sizeof(char));
+ 			for(int i=0;i<insidetable;i++) {
+@@ -97,8 +97,8 @@
+ 	noflag('-'), 
+ 
+ 	maxtable(1) {
+-		table=new (char *)[maxtable];
+-		lens=new (char)[maxtable];
++		table=new char *[maxtable];
++		lens=new char[maxtable];
+ 		insidetable=0;
+ 		half=maxres;
+ 		recalc();
+@@ -227,8 +227,8 @@
+ 		return -1;
+ 	char *convptr=convstr,*end;
+ 	int bitten=datbytes()*8;
+-	char **newtable=new (char *)[bitten];
+-	char *newlens=new (char )[bitten];
++	char **newtable=new char *[bitten];
++	char *newlens=new char [bitten];
+ 	for(nrtable=0;nrtable<bitten&&convptr<afterflags;nrtable++) {	
+ 		end=(char *)memchr(convptr,',',afterflags-convptr);
+ 		if(!end||end>afterflags)
+@@ -369,7 +369,7 @@
+ 		bytes=bitflags->datbytes();
+ 		created=0;
+ 		 maxtable=bitflags->maxtable;
+-		newtable= new (char *)[maxtable];
++		newtable= new char *[maxtable];
+ 		lens = new char[maxtable];
+ 		insidetable=bitflags->insidetable;
+ 		memmove(lens,bitflags->lens,sizeof(char)*insidetable);
+@@ -551,8 +551,8 @@
+ 				if(bit<bitten) {
+ 					char **oldtable=newtable;
+ 					char *oldlens=lens;
+-					newtable=new (char*)[bitten];
+-					lens=new (char)[bitten];
++					newtable=new char*[bitten];
++					lens=new char[bitten];
+ 					if(insidetable>0) {
+ 						memcpy(newtable,oldtable,insidetable*sizeof(char *));
+ 						memcpy(lens,oldlens,insidetable*sizeof(char ));
diff --git a/editors/bed/files/patch-plugins__examples__elftables.cc b/editors/bed/files/patch-plugins__examples__elftables.cc
new file mode 100644
index 000000000000..4850142c0104
--- /dev/null
+++ b/editors/bed/files/patch-plugins__examples__elftables.cc
@@ -0,0 +1,11 @@
+--- plugins/examples/elftables.cc.orig	Thu May 23 16:28:24 2002
++++ plugins/examples/elftables.cc	Tue Jan  2 00:16:12 2007
+@@ -43,7 +43,7 @@
+ class Editor {
+ public:
+ #include "faked.h"
+-int Editor::startindex2table(Filter * (*func)(int fb,int sb,char *opts,ScreenPart *part=NULL)) ;
++int Editor::startindex2table(startindex2table_func_t *func) ;
+ int Editor::getanswer(const char *question,char *answ,int anslen,int ansroom=5);
+ 
+ int Editor::getsymposition(int &length, int &startpos) ;
diff --git a/editors/bed/files/patch-plugins__examples__index2table.cc b/editors/bed/files/patch-plugins__examples__index2table.cc
new file mode 100644
index 000000000000..9376fc4f9a96
--- /dev/null
+++ b/editors/bed/files/patch-plugins__examples__index2table.cc
@@ -0,0 +1,11 @@
+--- plugins/examples/index2table.cc.orig	Sun Jan 25 13:42:00 2004
++++ plugins/examples/index2table.cc	Tue Jan  2 00:15:34 2007
+@@ -33,7 +33,7 @@
+ 
+ iscalled(index2table)
+ //int Editor::gettableposition(int &length, int &startpos) ;
+-int Editor::startindex2table(Filter * (*func)(int fb,int sb,char *opts,ScreenPart *part=NULL)) ;
++int Editor::startindex2table(startindex2table_func_t *func) ;
+ };
+ #define min(x,y) ((x)<(y)?(x):(y))
+ 	Index2table::Index2table(int fbytes,int sbytes,int off,int len,int pbase): tableoffset(off),maxintable(len),ptrbase(pbase),Filter(fbytes,sbytes) {
diff --git a/editors/bed/files/patch-plugins__examples__index2table.h b/editors/bed/files/patch-plugins__examples__index2table.h
new file mode 100644
index 000000000000..c2610501d77d
--- /dev/null
+++ b/editors/bed/files/patch-plugins__examples__index2table.h
@@ -0,0 +1,8 @@
+--- plugins/examples/index2table.h.orig	Thu May 23 16:28:24 2002
++++ plugins/examples/index2table.h	Tue Jan  2 00:15:22 2007
+@@ -52,3 +52,5 @@
+ 		return sym;\
+ 		}\
+ 	char *nam##name= initfilter(#nam,&get##nam);
++
++typedef Filter * startindex2table_func_t(int fb,int sb,char *opts,ScreenPart *part=NULL);
diff --git a/editors/bed/files/patch-src::Makefile b/editors/bed/files/patch-src::Makefile
index 2039b8fb2b05..df0a634ea95a 100644
--- a/editors/bed/files/patch-src::Makefile
+++ b/editors/bed/files/patch-src::Makefile
@@ -1,97 +1,11 @@
---- src/Makefile.orig	Mon Apr 21 11:40:57 2003
-+++ src/Makefile	Fri Mar 26 09:30:26 2004
-@@ -27,8 +27,8 @@
- 
- #-DENDOFLINEBUG
- 
--CFLAGS:=$(OPTS) $(CFLAGS) 
--LDFLAGS:=$(OPTS) $(LDFLAGS)
-+CFLAGS:=$(CFLAGS) 
-+LDFLAGS:=$(LDFLAGS)
- 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)
+--- src/Makefile.orig	Tue Mar  2 07:22:24 2004
++++ src/Makefile	Tue Jan  2 00:34:54 2007
+@@ -5,7 +5,7 @@
+ LIBS+= $(CURSESLIB) $(EXTRALIBS) $(OTHERLIBS)# -L/mnt/chicken/lib -L/mnt/chicken/usr/lib
+ CFLAGS+=  -D_GNU_SOURCE -DNEWTERM #-DUSE_NEW # -DMEMORY_TRACE	#-DREAD0x2x4DATATYPE #-DSEARCHTIME #-DUSE_NEW #-DMEMORY_TRACE	
+ 
+-OPTS:= $(OPTS) 
++OPTS:=
+ LIBPATH=-L. 
+ INLINKLISTER= ../plugins/examples/inlinklist
+ INLINKLIST= compileinlink
diff --git a/editors/bed/files/patch-src__filter.cpp b/editors/bed/files/patch-src__filter.cpp
new file mode 100644
index 000000000000..d12f8e629a34
--- /dev/null
+++ b/editors/bed/files/patch-src__filter.cpp
@@ -0,0 +1,18 @@
+--- src/filter.cpp.orig	Mon Jan 26 02:50:44 2004
++++ src/filter.cpp	Mon Jan  1 23:54:10 2007
+@@ -42,13 +42,13 @@
+ 		if(filtersmaxlen>=filtersnr) {
+ 			filtersmaxlen=(filtersmaxlen+10)*2;
+ 			char **tmp=filtersnames;
+-			filtersnames=new (char *)[filtersmaxlen];
++			filtersnames=new char *[filtersmaxlen];
+ 			if(tmp) {
+ 				memcpy(filtersnames,tmp,filtersnr*sizeof(char*));
+ 				delete[] tmp;
+ 				}
+ 			Filter *(**tmpfunc)(int,int,char*,ScreenPart *) =filtersfuncs;
+-			filtersfuncs=new (Filter *(*)(int,int,char*,ScreenPart *))[filtersmaxlen];
++			filtersfuncs=new typeof(Filter *(*)(int,int,char*,ScreenPart *))[filtersmaxlen];
+ 			if(tmpfunc) {
+ 				memcpy(filtersfuncs,tmpfunc,filtersnr*sizeof(Filter *(*)(int,int,char*)));
+ 				delete[] tmpfunc;
diff --git a/editors/bed/files/patch-src__getfile.h b/editors/bed/files/patch-src__getfile.h
new file mode 100644
index 000000000000..475140632c73
--- /dev/null
+++ b/editors/bed/files/patch-src__getfile.h
@@ -0,0 +1,29 @@
+--- src/getfile.h.orig	Thu May 23 16:28:24 2002
++++ src/getfile.h	Mon Jan  1 23:48:02 2007
+@@ -267,7 +267,7 @@
+ 
+ extern WINDOW *getshowwin(int l,int c,int by,int bx) ;
+ 
+-#define initdialog(nr) {item **showformsarray;int showformsiter=0,showformsmaxar=(nr);  showformsarray=new (item *)[showformsmaxar];
++#define initdialog(nr) {item **showformsarray;int showformsiter=0,showformsmaxar=(nr);  showformsarray=new item *[showformsmaxar];
+ #define dodialog(ant,l,c,sel) if((takescr=getshowwin((l),(c),(thelines-(l))/2,(thecols-(c))/2))){ (ant)=show(showformsarray,showformsiter,(sel));};for(int dodialogiter=0;dodialogiter<showformsiter;dodialogiter++) delete showformsarray[dodialogiter];delete[] showformsarray;};
+ #define dodialogpost(ant,l,c,sel,post) if((takescr=getshowwin((l),(c),(thelines-(l))/2,(thecols-(c))/2))){(post);(ant)=show(showformsarray,showformsiter,(sel));};for(int dodialogiter=0;dodialogiter<showformsiter;dodialogiter++) delete showformsarray[dodialogiter];delete[] showformsarray;};
+ #define showdialog(ant,l,c,sel) if((takescr=getshowwin((l),c,(thelines-(l))/2,(thecols-c)/2))){ant=show(showformsarray,showformsiter,sel);};
+@@ -278,7 +278,7 @@
+ #endif
+ 
+ 
+-#define begindialog(l,c,nr) if((takescr=getshowwin((l),(c),(thelines-(l))/2,(thecols-(c))/2))){item **showformsarray;int showformsiter=0,showformsmaxar=nr;  showformsarray=new (item *)[showformsmaxar]; 
++#define begindialog(l,c,nr) if((takescr=getshowwin((l),(c),(thelines-(l))/2,(thecols-(c))/2))){item **showformsarray;int showformsiter=0,showformsmaxar=nr;  showformsarray=new item *[showformsmaxar]; 
+ 
+ #define enddialog(ant,sel) ant=show(showformsarray,showformsiter,(sel));for(int dodialogiter=0;dodialogiter<showformsiter;dodialogiter++) delete showformsarray[dodialogiter];delete[] showformsarray;};
+ 
+@@ -299,7 +299,7 @@
+ #define lcsconfig(l,c,sel,...) plcsconfig(l,c,sel,0,__VA_ARGS__) 
+ #define plcsconfig(l,c,sel,post,...) {int throwawayant;palcsconfig(throwawayant,l,c,sel,post,__VA_ARGS__) } 
+ #define alcsconfig(ant,l,c,sel,...) palcsconfig(ant,l,c,sel,0,__VA_ARGS__)  
+-#define palcsconfig(ant,l,c,sel,post,...) {item **showformsarray;int showformsiter=0; int showformsmaxar=sizeof((item* []){__VA_ARGS__})/sizeof(item *); if((takescr=getshowwin(l,c,(thelines-l)/2,(thecols-c)/2))) { showformsarray=new (item *)[showformsmaxar],__VA_ARGS__;post;ant=show(showformsarray,showformsmaxar,sel);for(showformsiter=0;showformsiter<showformsmaxar;showformsiter++) delete showformsarray[showformsiter];delete[] showformsarray;};} 
++#define palcsconfig(ant,l,c,sel,post,...) {item **showformsarray;int showformsiter=0; int showformsmaxar=sizeof((item* []){__VA_ARGS__})/sizeof(item *); if((takescr=getshowwin(l,c,(thelines-l)/2,(thecols-c)/2))) { showformsarray=new item *[showformsmaxar],__VA_ARGS__;post;ant=show(showformsarray,showformsmaxar,sel);for(showformsiter=0;showformsiter<showformsmaxar;showformsiter++) delete showformsarray[showformsiter];delete[] showformsarray;};} 
+ #define options(name,sel,...)  {int startformsiter=showformsiter; Common *comptr=new Common(name,0);__VA_ARGS__,comptr->last=(orcheck*)showformsarray[startformsiter+sel];}; 
+ 
+ #endif
diff --git a/editors/bed/files/patch-src__typelist.cc b/editors/bed/files/patch-src__typelist.cc
new file mode 100644
index 000000000000..657abe205de7
--- /dev/null
+++ b/editors/bed/files/patch-src__typelist.cc
@@ -0,0 +1,18 @@
+--- src/typelist.cc.orig	Thu May 23 16:28:24 2002
++++ src/typelist.cc	Mon Jan  1 23:55:30 2007
+@@ -47,13 +47,13 @@
+ 		maxlen=(maxlen+10)*2;
+ 
+ 		char **tmp=names;
+-		names=new (char *)[maxlen];
++		names=new char *[maxlen];
+ 		if(tmp) {
+ 			memcpy(names,tmp,nr*sizeof(char*));
+ 			delete[] tmp;
+ 			}
+ 		ScreenPart *(**tmpfunc)(Editor*) =funcs;
+-		funcs=new (ScreenPart *(*)(Editor *))[maxlen];
++		funcs=new typeof(ScreenPart *(*)(Editor *))[maxlen];
+ 		if(tmpfunc) {
+ 			memcpy(funcs,tmpfunc,nr*sizeof(ScreenPart *(*)(Editor *)));
+ 			delete[] tmpfunc;
diff --git a/editors/bed/pkg-descr b/editors/bed/pkg-descr
index b3e706e4dfd3..d009407b3ebf 100644
--- a/editors/bed/pkg-descr
+++ b/editors/bed/pkg-descr
@@ -1,9 +1,9 @@
-Menu driven binary editor. Dataformats are
-ascii, unsigned and signed integers, float, bitflags,
-bitfields, labels, ebcdic and time_t. Different sizes
-and byte ordenings are possible. Datatypes can
-be used in structures. Other dataformats, filters and
-procedures can be defined in plugins. Contains copy,
-past, undo, redo, search, replace, marks, record/play and
-context sensitive help. Linux & FreeBSD: edit block devices 
-(linux limit 1023 gigabyte).
+Menu driven binary editor. Dataformats are ascii, unsigned and signed
+integers, float, bitflags, bitfields, labels, ebcdic and time_t. Different
+sizes and byte ordenings are possible. Datatypes can be used in structures.
+Other dataformats, filters and procedures can be defined in plugins. Contains
+copy, past, undo, redo, search, replace, marks, record/play and context
+sensitive help. Linux & FreeBSD: edit block devices (linux limit 1023
+gigabyte).
+
+WWW: http://bedlinux.tripod.com/
diff --git a/editors/bed/pkg-plist b/editors/bed/pkg-plist
index 4a0df9e8902c..98d81c241fae 100644
--- a/editors/bed/pkg-plist
+++ b/editors/bed/pkg-plist
@@ -1,115 +1,120 @@
-%%DATADIR%%/bedrc
+bin/bed
+%%X11%%bin/xbed
 %%DATADIR%%/.neededbybed
-%%DATADIR%%/misc/pushlpushl.bedda
-%%DATADIR%%/misc/hexasc.bedda
-%%DATADIR%%/misc/char2b.bedda
-%%DATADIR%%/misc/char2.bedda
-%%DATADIR%%/misc/bits.bedda
+%%DATADIR%%/LICENSE
+%%DATADIR%%/README
+%%DATADIR%%/addmagic.sh
+%%DATADIR%%/bed-0.2.23.lsm
+%%DATADIR%%/bedmagic
+%%DATADIR%%/bedrc
+%%DATADIR%%/config
 %%DATADIR%%/misc/README.txt
-%%DATADIR%%/misc/symtab.bedda
-%%DATADIR%%/misc/sectionheader.bedda
-%%DATADIR%%/misc/programheader.bedda
-%%DATADIR%%/misc/elfheader.bedda
+%%DATADIR%%/misc/bits.bedda
+%%DATADIR%%/misc/char2.bedda
+%%DATADIR%%/misc/char2b.bedda
 %%DATADIR%%/misc/dynsym.bedda
-%%DATADIR%%/misc/wtmp-freebsd.bedda
+%%DATADIR%%/misc/elfheader.bedda
+%%DATADIR%%/misc/hexasc.bedda
+%%DATADIR%%/misc/programheader.bedda
+%%DATADIR%%/misc/pushlpushl.bedda
+%%DATADIR%%/misc/sectionheader.bedda
+%%DATADIR%%/misc/symtab.bedda
 %%DATADIR%%/misc/win32sections.bedda
-%%DATADIR%%/utils/bin2byte
-%%DATADIR%%/utils/keyconfig
-%%DATADIR%%/plugins/plugin.cpp
-%%DATADIR%%/plugins/global.h
-%%DATADIR%%/plugins/faked.h
+%%DATADIR%%/misc/wtmp-freebsd.bedda
 %%DATADIR%%/plugins/Makefile
 %%DATADIR%%/plugins/ascii.h
-%%DATADIR%%/plugins/varmacro.h
 %%DATADIR%%/plugins/config.h
-%%DATADIR%%/plugins/digitstring.h
-%%DATADIR%%/plugins/views.h
-%%DATADIR%%/plugins/typelist.h
-%%DATADIR%%/plugins/type.h
-%%DATADIR%%/plugins/screenpart.h
-%%DATADIR%%/plugins/screen.h
-%%DATADIR%%/plugins/repeat.h
-%%DATADIR%%/plugins/mainprocedures.h
-%%DATADIR%%/plugins/offtypes.h
-%%DATADIR%%/plugins/multidigit.h
-%%DATADIR%%/plugins/hassub.h
-%%DATADIR%%/plugins/getfile.h
-%%DATADIR%%/plugins/filter.h
 %%DATADIR%%/plugins/contain.h
 %%DATADIR%%/plugins/defines.h
+%%DATADIR%%/plugins/digitstring.h
 %%DATADIR%%/plugins/examples/Makefile
-%%X11%%%%DATADIR%%/plugins/examples/switchsize.plug
-%%DATADIR%%/plugins/examples/rxvt.plug
-%%DATADIR%%/plugins/examples/elftables.plug
-%%DATADIR%%/plugins/examples/index2table.plug
+%%DATADIR%%/plugins/examples/ascii2ebcdic.h
+%%DATADIR%%/plugins/examples/backward.cc
+%%DATADIR%%/plugins/examples/backward.plug
+%%DATADIR%%/plugins/examples/bitcontains.cc
+%%DATADIR%%/plugins/examples/bitcpy.cc
+%%DATADIR%%/plugins/examples/bitfields.cc
+%%DATADIR%%/plugins/examples/bitfields.h
+%%DATADIR%%/plugins/examples/bitflags.cc
+%%DATADIR%%/plugins/examples/char2.cc
+%%DATADIR%%/plugins/examples/chars.c
+%%DATADIR%%/plugins/examples/crc.c
+%%DATADIR%%/plugins/examples/cut.cc
 %%DATADIR%%/plugins/examples/cut.plug
+%%DATADIR%%/plugins/examples/datatypeinfo.cc
 %%DATADIR%%/plugins/examples/datatypeinfo.plug
-%%DATADIR%%/plugins/examples/searchclip.plug
-%%DATADIR%%/plugins/examples/helpf1.plug
-%%DATADIR%%/plugins/examples/title.plug
-%%DATADIR%%/plugins/examples/backward.plug
-%%DATADIR%%/plugins/examples/file.plug
-%%DATADIR%%/plugins/examples/ebcdic2ascii.plug
-%%DATADIR%%/plugins/examples/macro2plug.sh
-%%DATADIR%%/plugins/examples/encodechar.sh
+%%DATADIR%%/plugins/examples/disass-use
+%%DATADIR%%/plugins/examples/disass-use.c
+%%DATADIR%%/plugins/examples/disass.cc
+%%DATADIR%%/plugins/examples/disass.plug
+%%DATADIR%%/plugins/examples/duplicate.cpp
 %%DATADIR%%/plugins/examples/ebcdic2ascii.cc
 %%DATADIR%%/plugins/examples/ebcdic2ascii.h
-%%DATADIR%%/plugins/examples/ascii2ebcdic.h
-%%X11%%%%DATADIR%%/plugins/examples/putselect.cc
-%%X11%%%%DATADIR%%/plugins/examples/switchsize.cc
-%%DATADIR%%/plugins/examples/rxvt.cc
-%%DATADIR%%/plugins/examples/index2table.h
+%%DATADIR%%/plugins/examples/ebcdic2ascii.plug
+%%DATADIR%%/plugins/examples/edit.cc
 %%DATADIR%%/plugins/examples/elftables.cc
+%%DATADIR%%/plugins/examples/elftables.plug
+%%DATADIR%%/plugins/examples/encodechar.sh
+%%DATADIR%%/plugins/examples/eventnames.h
+%%DATADIR%%/plugins/examples/file.cpp
+%%DATADIR%%/plugins/examples/file.plug
+%%DATADIR%%/plugins/examples/filter.cpp
+%%DATADIR%%/plugins/examples/filter.plug
+%%DATADIR%%/plugins/examples/float.cc
+%%DATADIR%%/plugins/examples/hash.h
+%%DATADIR%%/plugins/examples/helpf1.cc
+%%DATADIR%%/plugins/examples/helpf1.plug
 %%DATADIR%%/plugins/examples/index2table.cc
-%%DATADIR%%/plugins/examples/cut.cc
-%%DATADIR%%/plugins/examples/datatypeinfo.cc
+%%DATADIR%%/plugins/examples/index2table.h
+%%DATADIR%%/plugins/examples/index2table.plug
 %%DATADIR%%/plugins/examples/install.cc
+%%DATADIR%%/plugins/examples/macro2plug.sh
 %%DATADIR%%/plugins/examples/newdata.cc
+%%DATADIR%%/plugins/examples/nextitem.cpp
+%%DATADIR%%/plugins/examples/oldsigned.cc
+%%DATADIR%%/plugins/examples/oldsigned.h
+%%X11%%%%DATADIR%%/plugins/examples/putselect.cc
+%%X11%%%%DATADIR%%/plugins/examples/putselect.plug
+%%X11%%%%DATADIR%%/plugins/examples/rxvt.cc
+%%X11%%%%DATADIR%%/plugins/examples/rxvt.plug
 %%DATADIR%%/plugins/examples/searchclip.cc
-%%DATADIR%%/plugins/examples/helpf1.cc
-%%DATADIR%%/plugins/examples/title.cc
+%%DATADIR%%/plugins/examples/searchclip.plug
+%%DATADIR%%/plugins/examples/signed.cc
 %%DATADIR%%/plugins/examples/signed.h
-%%DATADIR%%/plugins/examples/oldsigned.h
-%%DATADIR%%/plugins/examples/hash.h
-%%DATADIR%%/plugins/examples/bitfields.h
-%%DATADIR%%/plugins/examples/oldsigned.cc
-%%DATADIR%%/plugins/examples/backward.cc
-%%DATADIR%%/plugins/examples/unsigned.cpp
-%%DATADIR%%/plugins/examples/undoall.cpp
-%%DATADIR%%/plugins/examples/translate.cc
-%%DATADIR%%/plugins/examples/time.cpp
 %%DATADIR%%/plugins/examples/skip.cpp
-%%DATADIR%%/plugins/examples/signed.cc
 %%DATADIR%%/plugins/examples/subtract.cc
-%%DATADIR%%/plugins/examples/nextitem.cpp
-%%DATADIR%%/plugins/examples/disass-use.c
-%%DATADIR%%/plugins/examples/disass.cc
-%%DATADIR%%/plugins/examples/float.cc
-%%DATADIR%%/plugins/examples/filter.cpp
-%%DATADIR%%/plugins/examples/file.cpp
-%%DATADIR%%/plugins/examples/edit.cc
-%%DATADIR%%/plugins/examples/duplicate.cpp
-%%DATADIR%%/plugins/examples/crc.c
-%%DATADIR%%/plugins/examples/chars.c
-%%DATADIR%%/plugins/examples/char2.cc
-%%DATADIR%%/plugins/examples/bitflags.cc
-%%DATADIR%%/plugins/examples/bitfields.cc
-%%DATADIR%%/plugins/examples/bitcpy.cc
-%%DATADIR%%/plugins/examples/bitcontains.cc
-%%X11%%%%DATADIR%%/plugins/examples/putselect.plug
-%%DATADIR%%/config
-%%DATADIR%%/terminfo/r/rxvtbed
-%%DATADIR%%/terminfo/r/rxvt
-%%DATADIR%%/LICENSE
-%%DATADIR%%/bed-0.2.19.lsm
-%%DATADIR%%/README
+%%X11%%%%DATADIR%%/plugins/examples/switchsize.cc
+%%X11%%%%DATADIR%%/plugins/examples/switchsize.plug
+%%DATADIR%%/plugins/examples/time.cpp
+%%DATADIR%%/plugins/examples/title.cc
+%%DATADIR%%/plugins/examples/title.plug
+%%DATADIR%%/plugins/examples/translate.cc
+%%DATADIR%%/plugins/examples/undoall.cpp
+%%DATADIR%%/plugins/examples/undoall.plug
+%%DATADIR%%/plugins/examples/unsigned.cpp
+%%DATADIR%%/plugins/faked.h
+%%DATADIR%%/plugins/filter.h
+%%DATADIR%%/plugins/getfile.h
+%%DATADIR%%/plugins/global.h
+%%DATADIR%%/plugins/hassub.h
+%%DATADIR%%/plugins/mainprocedures.h
+%%DATADIR%%/plugins/multidigit.h
+%%DATADIR%%/plugins/offtypes.h
+%%DATADIR%%/plugins/plugin.cpp
+%%DATADIR%%/plugins/repeat.h
+%%DATADIR%%/plugins/screen.h
+%%DATADIR%%/plugins/screenpart.h
+%%DATADIR%%/plugins/type.h
+%%DATADIR%%/plugins/typelist.h
+%%DATADIR%%/plugins/varmacro.h
+%%DATADIR%%/plugins/views.h
 %%DATADIR%%/public.key
-%%DATADIR%%/addmagic.sh
-%%DATADIR%%/bedmagic
+%%DATADIR%%/terminfo/r/rxvt
+%%DATADIR%%/terminfo/r/rxvtbed
 %%DATADIR%%/testmarks.bedm
 %%DATADIR%%/uninstallbed.sh
-bin/bed
-%%X11%%bin/xbed
+%%DATADIR%%/utils/bin2byte
+%%DATADIR%%/utils/keyconfig
 @dirrm %%DATADIR%%/utils
 @dirrm %%DATADIR%%/terminfo/r
 @dirrm %%DATADIR%%/terminfo