. If PACKAGE_BUILDING is set, then set WITHOUT_X11 as we can't guarantee

that we have an appropriate rxvt. . Make rxvt a PATCH_DEPENDS as it is tested in pre-configure (there is no CONFIGURE_DEPENDS). . Fix packing list and unbreak. . Fix some minor whitespace bogons in Makefile. . Add patches which hopefully fix the build on 5.x. . Add a patch to stop the port installing stuff outside of ${PREFIX}. Some of this could be added back in with a better patch that installed it in the right place.
svn path=/head/; revision=98812
2025-02-03 11:12:13 +00:00 · 2004-01-22 17:39:08 +00:00 · 2004-01-22 17:39:08 +00:00 · a7012e1423 · 2021-03-31 03:12:20 +00:00
commit a7012e1423
parent 94e6e6740d
7 changed files with 286 additions and 10 deletions
--- a/editors/bed/Makefile
+++ b/editors/bed/Makefile
@ -15,20 +15,23 @@ EXTRACT_SUFX=		.src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Variable dataformat binary editor

-BUILD_DEPENDS=		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
-.if !defined(WITHOUT_X11)
-BUILD_DEPENDS+=	${X11BASE}/bin/rxvt:${PORTSDIR}/x11/rxvt
-RUN_DEPENDS=	${X11BASE}/bin/rxvt:${PORTSDIR}/x11/rxvt
+# Cannot guarantee rxvt will have menubar enabled on bento.
+.if defined(PACKAGE_BUILDING)
+WITHOUT_X11=	yes
 .endif

-BROKEN=		"Broken pkg-plist on 4.x, does not build on 5.x; will be removed after Feb 2"
+BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
+.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_GMAKE=	yes

-MAN1=  bed.1 xbed.1
-MANCOMPRESSED= yes
+MAN1=		bed.1 xbed.1
+MANCOMPRESSED=	yes

 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-x
--- a/editors/bed/files/patch-Makefile
+++ b/editors/bed/files/patch-Makefile
@ -1,7 +1,7 @@
 $FreeBSD$

--- Makefile.orig	Tue Oct  7 13:57:29 2003
-+++ Makefile	Tue Oct  7 13:58:03 2003
+--- Makefile.orig	Fri Apr 18 14:45:51 2003
+++ Makefile	Thu Jan 22 10:21:03 2004
@@ -57,7 +57,7 @@
 	-mv  $(ROOTDIR)$(CONFDIRLINK) $(CONFDIRLINK).bak
 	-$(MKDIR) $(ROOTDIR)$(CONFDIR)
@ -11,3 +11,39 @@ $FreeBSD$
 	-mv  $(ROOTDIR)$(CONFDIR)/$(CONFFILE) $(ROOTDIR)$(CONFDIR)/~$(CONFFILE)
 endif
 	$(CP) $(CONFFILE) $(ROOTDIR)$(CONFDIR)
+@@ -102,17 +102,17 @@
+ 	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 ;
+ ifeq ($(CONFIG_PROGMAN),y)
+ #	cp bed.xpm $(ROOTDIR)$(ICONPATH)
+ #	cp bedsmall.xpm $(ROOTDIR)$(ICONPATH)/mini/bed.xpm
+@@ -127,7 +127,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
+-	@echo Uninstall with sh $(ROOTDIR)$(CONFDIR)/uninstallbed.sh
+#	@echo Uninstall with sh $(ROOTDIR)$(CONFDIR)/uninstallbed.sh
+ endif
+ endif
+ 	@echo Binary: '$(ROOTDIR)$(BINDIR)/$(EXEPROGRAM)'
--- a/editors/bed/files/patch-editmacros.cpp
+++ b/editors/bed/files/patch-editmacros.cpp
@ -0,0 +1,11 @@
+--- src/editmacros.cpp.orig	Mon Dec  8 10:34:23 2003
+++ src/editmacros.cpp	Mon Dec  8 10:35:00 2003
+@@ -153,7 +153,7 @@
+ #define	offwrite(handle,off,str, len) ((lseek(handle,off,SEEK_SET)==off)?write(handle,str,len)==len:0)
+ #include "varmacro.h"
+ #ifdef OLDGCCVARMACRO
+-#define returnmessage(x...) {message( ## x);beep();erefresh();return -1;} VARMACRO
+#define returnmessage(x...) {message(  x);beep();erefresh();return -1;} VARMACRO
+ #else
+ #define returnmessage(...) {message(__VA_ARGS__);beep();erefresh();return -1;} 
+ #endif
--- a/editors/bed/files/patch-getfile.cpp
+++ b/editors/bed/files/patch-getfile.cpp
@ -0,0 +1,13 @@
+--- src/getfile.cpp.orig	Thu Apr 17 06:53:47 2003
+++ src/getfile.cpp	Mon Dec  8 10:33:51 2003
+@@ -503,8 +503,8 @@
+ 		};
+ #include "varmacro.h"
+ #ifdef OLDGCCVARMACRO
+-#define	keydef(sym,keys...) input.putseq(sym,sizeof((unsigned char [])##keys),(unsigned char []) ##keys)  VARMACRO
+-#define	seqput(sym,keys...) keyinp->putseq(sym,sizeof((unsigned char [])##keys),(unsigned char []) ##keys) VARMACRO
+#define	keydef(sym,keys...) input.putseq(sym,sizeof((unsigned char [])keys),(unsigned char []) keys)  VARMACRO
+#define	seqput(sym,keys...) keyinp->putseq(sym,sizeof((unsigned char [])keys),(unsigned char []) keys) VARMACRO
+ #else
+ #define	keydef(sym,...) input.putseq(sym,sizeof((unsigned char [])__VA_ARGS__),(unsigned char []) __VA_ARGS__)  
+ #define	seqput(sym,...) keyinp->putseq(sym,sizeof((unsigned char [])__VA_ARGS__),(unsigned char []) __VA_ARGS__) 
--- a/editors/bed/files/patch-keyconfig.cpp
+++ b/editors/bed/files/patch-keyconfig.cpp
@ -0,0 +1,23 @@
+--- 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
--- a/editors/bed/files/patch-plugins::examples::Makefile
+++ b/editors/bed/files/patch-plugins::examples::Makefile
@ -0,0 +1,190 @@
+--- plugins/examples/Makefile.orig	Tue Dec 16 11:00:59 2003
+++ plugins/examples/Makefile	Tue Dec 16 11:01:51 2003
+@@ -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 $@ 
+	$(CC) $(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 $@
+ 
+ bitcontains.plug: bitcontains.o bitcpy.o bitfields.o
+-	$(GCC) $(PLUGINLDFLAGS) -shared  $^ -o $@ 
+	$(CC) $(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 $@
+	$(CC) $(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 $@
+ 
+ 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 $@
+ %.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 $@
+ 
+ %.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 $@
+ 
+ #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 $@
+	$(CC) -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 $@
+ %.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 $@
+ 
+ %.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 $@
+ %.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
+ 
+ 
+ %.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 $@
+ 
+ %.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 $@
+ %.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 $@
+ 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 $@
+	$(CC) -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 @@
+ endif
+ 
+ switchsize.plug: switchsize.o
+-	$(GCC) $(PLUGINLDFLAGS) -shared $< -o $@ $(X_LIBS) -lX11 $(X_EXTRA_LIBS)
+	$(CC) $(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)
+ 	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)
+ 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)
+	$(CC) -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 $@
+	$(CC) $(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 $@
+	$(CC) $(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 $@
+ 
+ ../mainprocedures.h:
+ 	$(MAKE) -C .. mainprocedures.h
+@@ -327,14 +327,14 @@
+ plughelp: mkhelp 
+ 	./mkhelp > plughelp
+ mkhelp: mkhelp.h mkhelp.c
+-	gcc -DHELP_H='"mkhelp.h"' mkhelp.c -o mkhelp
+	$(CC) -DHELP_H='"mkhelp.h"' mkhelp.c -o mkhelp
+ mkhelp.h: $(INLINKSRC)  mkhelp.sh $(CONFIG)
+ 	sh ./mkhelp.sh  $(INLINKSRC)  > mkhelp.h
+ 
+ plugman: mkman 
+ 	./mkman > plugman
+ mkman: mkman.h mkhelp.c
+-	gcc -DHELP_H='"mkman.h"' mkhelp.c -o mkman
+	$(CC) -DHELP_H='"mkman.h"' mkhelp.c -o mkman
+ mkman.h: $(SRC) mkhelp.sh 
+ 	sh ./mkhelp.sh $(filter-out $(INLINKSRC),$(SRC)) > mkman.h
+ 
--- a/editors/bed/pkg-plist
+++ b/editors/bed/pkg-plist
@ -109,7 +109,7 @@
 %%DATADIR%%/testmarks.bedm
 %%DATADIR%%/uninstallbed.sh
 bin/bed
-bin/xbed
+%%X11%%bin/xbed
@dirrm %%DATADIR%%/utils
@dirrm %%DATADIR%%/terminfo/r
@dirrm %%DATADIR%%/terminfo