diff --git a/editors/xwpe/DESCR b/editors/xwpe/DESCR index d6ae7bc5fa814..38ca5e9222d18 100644 --- a/editors/xwpe/DESCR +++ b/editors/xwpe/DESCR @@ -1,3 +1,7 @@ -xwpe is a programming environment for UNIX systems writen by Fred Kruse. -The user interface mimics the Borland C and Pascal family of products for -MS-DOS. From within xwpe you can edit, compile, and debug programs. +xwpe (the X Windows Programming Environment) is a programming and text editor +in the style of the early-1990s Borland Turbo C IDE. A single binary runs in +the console (wpe/we, ncurses) or under X11 (xwpe/xwe, anti-aliased Xft/Cairo, +UTF-8). It pairs a syntax-highlighting editor with a Borland-style menu and +dialog system, project management, multi-language compiler integration and +source-level debugging through gdb, plus Language Server Protocol and Debug +Adapter Protocol clients. diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile index 6b7d7937054d4..9001b77dbbcef 100644 --- a/editors/xwpe/Makefile +++ b/editors/xwpe/Makefile @@ -1,35 +1,30 @@ -# $NetBSD: Makefile,v 1.19 2025/06/02 12:54:30 vins Exp $ -# +# $NetBSD$ -DISTNAME= xwpe-1.5.30a -PKGREVISION= 1 +DISTNAME= xwpe-1.6.6 CATEGORIES= editors -MASTER_SITES= http://www.identicalsoftware.com/xwpe/ +MASTER_SITES= https://codeberg.org/mendezr/xwpe/releases/download/v1.6.6/ MAINTAINER= vins@NetBSD.org -HOMEPAGE= http://www.identicalsoftware.com/xwpe/ +HOMEPAGE= https://codeberg.org/mendezr/xwpe/ COMMENT= Programming environment for UNIX systems LICENSE= gnu-gpl-v2 -GNU_CONFIGURE= yes +USE_TOOLS+= gmake pkg-config makeinfo +USE_LANGUAGES= c +USE_NCURSES= yes +GNU_CONFIGURE= yes +INFO_FILES= yes +ICON_THEMES= yes -BUILD_TARGET= # the one from the Makefile +CONFIGURE_ARGS+= --without-gpm -BUILDLINK_DEPMETHOD.libXt?= build - -INSTALLATION_DIRS+= share/applications -INSTALLATION_DIRS+= share/pixmaps - -post-install: - ${INSTALL_DATA} ${FILESDIR}/xwpe.desktop \ - ${DESTDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${FILESDIR}/xwpe.xpm \ - ${DESTDIR}${PREFIX}/share/pixmaps - -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../x11/libSM/buildlink3.mk" +.include "../../textproc/json-c/buildlink3.mk" +.include "../../devel/libvterm01/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/xwpe/PLIST b/editors/xwpe/PLIST index 9f667c514e73e..01ac6ed84210b 100644 --- a/editors/xwpe/PLIST +++ b/editors/xwpe/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.4 2022/12/08 08:51:55 vins Exp $ +@comment $NetBSD$ bin/we bin/wpe bin/xwe bin/xwpe +info/xwpe.info lib/xwpe/help.key lib/xwpe/help.xwpe lib/xwpe/syntax_def @@ -11,4 +12,5 @@ man/man1/wpe.1 man/man1/xwe.1 man/man1/xwpe.1 share/applications/xwpe.desktop -share/pixmaps/xwpe.xpm +share/icons/hicolor/scalable/apps/xwpe.svg +share/metainfo/io.codeberg.mendezr.xwpe.metainfo.xml diff --git a/editors/xwpe/distinfo b/editors/xwpe/distinfo index 726ee737c1b06..a8abf123bbc14 100644 --- a/editors/xwpe/distinfo +++ b/editors/xwpe/distinfo @@ -1,14 +1,5 @@ -$NetBSD: distinfo,v 1.11 2025/06/02 12:54:30 vins Exp $ +$NetBSD$ -BLAKE2s (xwpe-1.5.30a.tar.gz) = 5e33b6cb1880b38dbf551138e807b18a952d282a41411704ada6fabdb34680d4 -SHA512 (xwpe-1.5.30a.tar.gz) = c5b182f798caeeaa7ba62bd3692690030623d317795d907e4fac3f524f53aa299af5d735d9b03185eaa07526f0146c4fa8d09efbbab6790f5e329fd52359b797 -Size (xwpe-1.5.30a.tar.gz) = 325043 bytes -SHA1 (patch-WeXterm.c) = d60a373aafdcc586aad27f25d82b2af53e318e6b -SHA1 (patch-aa) = cf7bc074e1dc8cda086dfe29ebfdca1c0f261c1d -SHA1 (patch-ab) = c59dc6c530bbe21e0c22f2c258745ecb7730b156 -SHA1 (patch-edit.h) = 8fa47ec3d81a761a9c70e4ead6ab182b9c3eccb4 -SHA1 (patch-we__fl__unix.c) = 076a4dc92297ae8d13213ddaddc02c24b716851d -SHA1 (patch-we__main.c) = 5112e6ce7ab4c11afd230f4709fcf1c6ed702fc0 -SHA1 (patch-we__prog.c) = e6de61bc04cf803e722c8f1ec596bb2f29be9693 -SHA1 (patch-we__term.c) = efaf0cdaa21d0370344cd8e89766265e8f9e6e23 -SHA1 (patch-we__xterm.c) = 5b63e0df612ffdff64838d1faf5b558d9179b3dc +BLAKE2s (xwpe-1.6.6.tar.gz) = 9f947cd0678b968d3893e0c0b5129d5d4c4ee08cc1b1fb080049bfe7ef3829da +SHA512 (xwpe-1.6.6.tar.gz) = acf32b51e6eac121190eb580f429d52c32e430829a6dccfe9d1c86f48fcba432a19bc5f4211f17a5b0bea0e0810c20e5d1008f7a1f503ba36ac0ee85c842464d +Size (xwpe-1.6.6.tar.gz) = 1207219 bytes diff --git a/editors/xwpe/files/xwpe.desktop b/editors/xwpe/files/xwpe.desktop deleted file mode 100644 index b81bfbcdcaa41..0000000000000 --- a/editors/xwpe/files/xwpe.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Xwpe -GenericName=Borland-like Text Editor -Comment=Xwpe Integrated Development Environment -Exec=xwpe -Keywords=text;editor;ide;borland; -Keywords[fr]=texte;éditeur;borland; -Categories=Utility;TextEditor;IDE;Development; -MimeType=text/plain;text/english;text/x-c;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-pascal;text/x-fortran; -Icon=xwpe -TryExec=xwpe -Exec=xwpe %F -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;IDE;Development; diff --git a/editors/xwpe/files/xwpe.xpm b/editors/xwpe/files/xwpe.xpm deleted file mode 100644 index 1bc1d1c5be7a0..0000000000000 --- a/editors/xwpe/files/xwpe.xpm +++ /dev/null @@ -1,84 +0,0 @@ -/* XPM */ -static char * xwpe_w_xpm[] = { -"48 48 33 1", -" c None", -". c #C3C8D6", -"+ c #D1D9E4", -"@ c #DEE7EE", -"# c #ADADB1", -"$ c #E7F4F4", -"% c #9C99A7", -"& c #B6B8C9", -"* c #564C54", -"= c #565655", -"- c #7E7888", -"; c #030205", -"> c #645864", -", c #8F8996", -"' c #776882", -") c #2B1C41", -"! c #506978", -"~ c #437D8B", -"{ c #4A3876", -"] c #484A83", -"^ c #7C69E8", -"/ c #8A7CE3", -"( c #6148ED", -"_ c #6B57E3", -": c #290C44", -"< c #9D95E4", -"[ c #4623F9", -"} c #4636B6", -"| c #5537DE", -"1 c #401DE2", -"2 c #462699", -"3 c #2E223C", -"4 c #9085DC", -".+++@@@+#$$@%##############################%@&..", -"%%@@++$++@@+&*============================-@$.%;", -"#*#+.+++@$$@$.============================&++#*;", -"#=-+.+.&+@+@$@>=========================*,++#'=;", -"#=='.&#%.@@@@..);;;;;;#==;;;;;;;;;;;;;;;'&.&'==;", -"#===>&-',.$@&&+.!~~~~~#==;~~~~~~~~~~~~~%.+.,===;", -"#===)%-%#-,,#+$+-~~~~~#==;~~~~~~~~~~~~!+.+%#===;", -"#===;!%&&#,%@@@.%!~~~~#==;~~~##~~~~~~!.@+.!#===;", -"#===;~!....%.@++#%=~~~#==;~~##~~~~~~!.$$@!~#===;", -"#===;~!,#&&.&%,..-,!~~#==;~~##~~~~~~+$$@!~~#===;", -"#===;~~,'&++++%,-,&-!~#==;~~#~~~~~~!..@%!~~#===;", -"#===;~~~!>%.+&%%-'+.'~#==;~~~~~~~~!+@.&!~~~#===;", -"#===;~~~~'-#+++&,'-&+!#==;~~~~~~~!$$$&!~~~~#===;", -"#===;~~~~!--...&#&--.#%==;~~~~~~~.$$+!~~~~~#===;", -"#===;~~~~~!,,.%#.+.%#&,*=;~~~~~~'.@@#!~~~~~#===;", -"#*==;~~~~~~,&%&&#%##&,,>=;~~~~~-#&&#~~~~~~~#===;", -"-{{{;~~~~!]]^/%&&-((_^#^{:]]]]]_^<-!~!]]]]]'{{{:", -">[[[:~~~~}[[[/.#+%[[[_#([[[[[[[[[|=~~][[[[[[[[[1", -"=[[[:~~~=[[[[^+++/[[[-/|[[}}|([[[1]~~{[[[}}(2223", -">[[[:~~~}[[[[]!+&([[|#/[[[_!%@([[[]~!1[[]~~#===;", -"-[[[:~~]1[[[[]~!/[[[<.^[[[>'.$_[[[]~![[[]~~#===;", -",[[[:~~{[[[[[]~!([[(&._[[1!&%.([[1]~][[[]~~#===;", -",[[['#,1[[1[['#,1[|<@&|[[(#.%%[[[|%#}[[|>'''{{=;", -",[[[{=2[[{1[[{=2[[(++<[[[_&../[[[2==1[[[[[[[[2=;", -",[[[{*[[[*1[[{*[[[4@.^[[[|^/([[[1*={[[[111111{=;", -",[[[:)[[:;1[[:)[[1.+@|[[[[[[[[[[:;;:[[[::::'{==;", -",[[[)}[1!!1[[]}[[/$$+[[[[[[[[[[^!~~}[[[~~~~#===;", -"'[[[[[[]~!1[[1[[(++@4[[[_4##&&-'!~~}[[1~~~~#===;", -"-[[[[[2!#,1[[[[[4@.-}[[[4.+..&#''!][[[{~~~~#===;", -",[[[[[}##!1[[[[|#&'!}[[[%.+#%,--'%_[[[!~~~~#===;", -",[[[[[~##!1[[[[_%#-!}[[|%##>-%#,#*}[[[1111111==;", -",[[[[{~#~!1[[[[#.,~][[[{%%%>>%&&%-}[[[[[[[[[[==;", -",1[[1!~~~~{[[[_+-~~]1[[{*,,-#++..#([[[[[[[[[{==;", -"#===;~~~~~~!$$$%~~~~~~#=*%+,.@@.&+++,!~~~~~#===;", -"#===;~~~~~!&$@+!~~~~~~#==:&&#++&.++@@%!~~~~#===;", -"#===;~~~~!&+.&'~~~~~~~#==;!%#+++++@@@&#~~~~#===;", -"#===;~~~~,.@+!~~~~~~~~#*=;~,@@@@$+++++@!~~~#===;", -"#===;~~~!.@$&!~~~~~~~~#==;~!%++@+&&...@#!~~#===;", -"#===;~~!&@@+!~~~~~~~~~#==;~~!%&+@+.+++@+&!~#===;", -"#===;~!++$.!~~~~~~~~~~#==;~~~=@$$+@@$$$@@!~#===;", -"#===;~,.@+!~~~~~~~~~~~#==;~~~~,$$$$+.+$@+.!#===;", -"#===;-..+#!~~~~~~~~~~~#==;~~~~~,$@@.+++@+&&,===;", -"#===>&,',~~~~~~~~~~~~~#==;~~~~~!.@.&+@+&...,===;", -"#===+#-'%##############==#######%$+.@@++.+.,>==;", -"#==%&#,>=========================>@+$$$+..#%%>=;", -"#*#@++>==========================*%+$$$$@++&&%*;", -"%%@+@-=============================&$$$$@@@&&#,;", -"-$+.>;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;.+$@....+,&,"}; diff --git a/editors/xwpe/patches/patch-WeXterm.c b/editors/xwpe/patches/patch-WeXterm.c deleted file mode 100644 index 9879ff399e2ee..0000000000000 --- a/editors/xwpe/patches/patch-WeXterm.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-WeXterm.c,v 1.1 2022/12/08 10:31:08 vins Exp $ - -Fix implicit declaration warnings. - ---- WeXterm.c.orig 2005-07-07 01:53:09.000000000 +0000 -+++ WeXterm.c -@@ -37,6 +37,13 @@ - #endif - #endif - -+#ifndef __WE_XTERM_H -+#define __WE_XTERM_H -+ -+int e_X_sw_color(void); -+ -+#endif -+ - /* Information from X that is needed throughout execution */ - WpeXStruct WpeXInfo; - diff --git a/editors/xwpe/patches/patch-aa b/editors/xwpe/patches/patch-aa deleted file mode 100644 index e36a4cc1002fa..0000000000000 --- a/editors/xwpe/patches/patch-aa +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2022/12/08 08:51:56 vins Exp $ - -* DESTDIR support. -* Properly honor runtime library path for X11 libs. - ---- Makefile.in.orig 2005-07-07 01:53:09.000000000 +0000 -+++ Makefile.in -@@ -9,7 +9,7 @@ srcdir= @srcdir@ - #Destination Directory - prefix=@prefix@ - exec_prefix=@exec_prefix@ --DESTDIR=@bindir@ -+BINDIR=@bindir@ - LIBDIR=@libdir@ - XWPELIBDIR= $(LIBDIR)/xwpe - MANDIR=@mandir@ -@@ -91,14 +91,14 @@ HFILES= attrb.h edit.h keys.h \ - - xwpe: $(OFILES) $(X_OFILES) $(T_OFILES) - $(CC) $(CFLAGS) $(DEFS) $(OFILES) $(X_OFILES) $(T_OFILES) \ -- $(LIBS) $(XLIBS) -o xwpe -+ $(LDFLAGS) $(LIBS) $(XLIBS) -o xwpe - # $(CC) -Wl,-E $(CFLAGS) $(DEFS) $(OFILES) $(LIBS) -o xwpe - - libxwpe-x11.so: $(X_OFILES) -- $(CC) -shared $(X_OFILES) $(XLIBS) -o libxwpe-x11.so -+ $(CC) -shared $(X_OFILES) $(LDFLAGS) $(XLIBS) -o libxwpe-x11.so - - libxwpe-term.so: $(T_OFILES) -- $(CC) -shared $(T_OFILES) -o libxwpe-term.so -+ $(CC) -shared $(T_OFILES) $(LDFLAGS) -o libxwpe-term.so - - #$(X_OFILES) $(T_OFILES): $(HFILES) - # $(CC) -fPIC $(CFLAGS) $(DEFS) -c $(subst .o,.c,$@) -@@ -115,36 +115,27 @@ distclean: - # Bug Note: Currently xwpe and xwe are installed even if X windows versions - # are not compiled. (They will function as wpe and we respectively.) - install_fst: xwpe -- if test ! -d $(DESTDIR); then mkdir -p $(DESTDIR); fi -- if test ! -d $(XWPELIBDIR); then mkdir -p $(XWPELIBDIR); fi -- rm -f $(DESTDIR)/wpe $(DESTDIR)/xwpe $(DESTDIR)/we $(DESTDIR)/xwe -- $(INSTALL) xwpe $(DESTDIR)/we -- chmod ugo+x $(DESTDIR)/we -- (cd $(DESTDIR) && $(LN_S) we xwe) -- (cd $(DESTDIR) && $(LN_S) we xwpe) -- (cd $(DESTDIR) && $(LN_S) we wpe) -- rm -f $(XWPELIBDIR)/help.xwpe -- if test ! -f $(XWPELIBDIR)/syntax_def; then \ -- $(INSTALL) syntax_def $(XWPELIBDIR)/syntax_def; \ -- chmod ugo=r $(XWPELIBDIR)/syntax_def; fi -- if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi -- rm -f $(MANDIR)/man1/xwpe.1 $(MANDIR)/man1/xwe.1 -- rm -f $(MANDIR)/man1/wpe.1 $(MANDIR)/man1/we.1 -- $(INSTALL) xwe.1 wpe.1 we.1 $(MANDIR)/man1 -- chmod ugo=r $(MANDIR)/man1/xwe.1 -- chmod ugo=r $(MANDIR)/man1/wpe.1 $(MANDIR)/man1/we.1 -+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(BINDIR) -+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(XWPELIBDIR) -+ rm -f ${DESTDIR}$(BINDIR)/wpe ${DESTDIR}$(BINDIR)/xwpe ${DESTDIR}$(BINDIR)/we ${DESTDIR}$(BINDIR)/xwe -+ ${BSD_INSTALL_PROGRAM} xwpe ${DESTDIR}$(BINDIR)/we -+ (cd ${DESTDIR}$(BINDIR) && $(LN_S) we xwe) -+ (cd ${DESTDIR}$(BINDIR) && $(LN_S) we xwpe) -+ (cd ${DESTDIR}$(BINDIR) && $(LN_S) we wpe) -+ rm -f ${DESTDIR}$(XWPELIBDIR)/help.xwpe -+ if test ! -f ${DESTDIR}$(XWPELIBDIR)/syntax_def; then \ -+ ${BSD_INSTALL_DATA} syntax_def ${DESTDIR}$(XWPELIBDIR)/syntax_def; fi -+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1 -+ ${BSD_INSTALL_MAN} xwe.1 wpe.1 we.1 ${DESTDIR}$(MANDIR)/man1 - if test -f libxwpe-x11.so; then \ -- $(INSTALL) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi -+ ${BSD_INSTALL_DATA} libxwpe-x11.so ${DESTDIR}$(XWPELIBDIR)/libxwpe-x11.so; fi - if test -f libxwpe-term.so; then \ -- $(INSTALL) libxwpe-term.so $(XWPELIBDIR)/libxwpe-term.so; fi -+ ${BSD_INSTALL_DATA} libxwpe-term.so ${DESTDIR}$(XWPELIBDIR)/libxwpe-term.so; fi - - install: install_fst -- $(INSTALL) help.xwpe_eng $(XWPELIBDIR)/help.xwpe -- chmod ugo=r $(XWPELIBDIR)/help.xwpe -- $(INSTALL) help.key_eng $(XWPELIBDIR)/help.key -- chmod ugo=r $(XWPELIBDIR)/help.key -- $(INSTALL) xwpe.1_eng $(MANDIR)/man1/xwpe.1 -- chmod ugo=r $(MANDIR)/man1/xwpe.1 -+ ${BSD_INSTALL_DATA} help.xwpe_eng ${DESTDIR}$(XWPELIBDIR)/help.xwpe -+ ${BSD_INSTALL_DATA} help.key_eng ${DESTDIR}$(XWPELIBDIR)/help.key -+ ${BSD_INSTALL_DATA} xwpe.1_eng ${DESTDIR}$(MANDIR)/man1/xwpe.1 - - # German install uses old documention as no updated version is available - install_german: install_fst diff --git a/editors/xwpe/patches/patch-ab b/editors/xwpe/patches/patch-ab deleted file mode 100644 index df120eae5d6d5..0000000000000 --- a/editors/xwpe/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2022/12/08 10:31:08 vins Exp $ - -* Depend on [n]curses to provide prototypes for tparm and tgoto. -* Fix implicit declaration warnings. - ---- we_debug.c.orig 2005-07-07 01:53:09.000000000 +0000 -+++ we_debug.c -@@ -7,6 +7,13 @@ - #include "messages.h" - #include "edit.h" - -+#ifndef __WE_PROG_H -+#define __WE_PROG_H -+ -+int print_to_end_of_buffer(BUFFER *b, char *str, int wrap_limit); -+ -+#endif -+ - #ifndef NO_XWINDOWS - #include "WeXterm.h" - #endif -@@ -62,10 +69,6 @@ extern BUFFER *e_p_w_buffer; - extern char *att_no; - extern char *e_tmp_dir; - --#ifdef NOTPARM --char *tparm(); --char *tgoto(); --#endif - #ifdef DEFTPUTS - int tputs(); - #endif diff --git a/editors/xwpe/patches/patch-edit.h b/editors/xwpe/patches/patch-edit.h deleted file mode 100644 index 09e0c6d321c9d..0000000000000 --- a/editors/xwpe/patches/patch-edit.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-edit.h,v 1.2 2022/12/08 10:31:08 vins Exp $ - -Fix typo in int declaration. - ---- edit.h.orig 2005-07-07 01:53:09.000000000 +0000 -+++ edit.h -@@ -793,7 +793,7 @@ int e_d_reinit_watches(FENSTER *f,char * - - /* we_gpm.c */ - #ifdef HAVE_LIBGPM --int WpeGpmInit(void); -+int WpeGpmMouseInit(void); - int WpeGpmMouse(int *g); - #endif - diff --git a/editors/xwpe/patches/patch-we__fl__unix.c b/editors/xwpe/patches/patch-we__fl__unix.c deleted file mode 100644 index a6a71207b2195..0000000000000 --- a/editors/xwpe/patches/patch-we__fl__unix.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-we__fl__unix.c,v 1.1 2025/06/02 12:54:30 vins Exp $ - -Fix format-security warning in printf() usage. - ---- we_fl_unix.c.orig 2005-07-07 01:53:09.000000000 +0000 -+++ we_fl_unix.c -@@ -1044,7 +1044,7 @@ int WpeHandleFileManager(ECNT * cn) - } - else if(!WpeIsXwin()) - { -- printf(e_msg[ERR_HITCR]); -+ printf("%s", e_msg[ERR_HITCR]); - fflush(stderr); - fflush(stdout); - fk_getch(); diff --git a/editors/xwpe/patches/patch-we__main.c b/editors/xwpe/patches/patch-we__main.c deleted file mode 100644 index 09b786ccbf944..0000000000000 --- a/editors/xwpe/patches/patch-we__main.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-we__main.c,v 1.1 2022/12/08 08:51:56 vins Exp $ - -Repair bug in error message when immediately running out of memory. - ---- we_main.c.orig 2005-07-07 01:53:09.000000000 +0000 -+++ we_main.c -@@ -307,8 +307,10 @@ int main(int argc, char **argv) - int so = 0, sd = 1; - char *tp; - -- if ((cn = (ECNT *)MALLOC(sizeof(ECNT))) == NULL) -- e_error(e_msg[ERR_LOWMEM], 2, fb); -+ if ((cn = (ECNT *)MALLOC(sizeof(ECNT))) == NULL) { -+ printf(" Fatal Error: %s\n", e_msg[ERR_LOWMEM]); -+ return 0; -+ } - ECNT_Init(cn); - e_ini_unix(&argc, argv); - e_switch_screen(1); diff --git a/editors/xwpe/patches/patch-we__prog.c b/editors/xwpe/patches/patch-we__prog.c deleted file mode 100644 index d5db6bece3240..0000000000000 --- a/editors/xwpe/patches/patch-we__prog.c +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-we__prog.c,v 1.2 2025/06/02 12:54:30 vins Exp $ - -* Fix implicit declaration warnings. -* Fix format-security warning around improper printf() usage. - ---- we_prog.c.orig 2005-07-07 01:53:09.000000000 +0000 -+++ we_prog.c -@@ -8,6 +8,13 @@ - #include "edit.h" - #include "WeExpArr.h" - -+#ifndef __WE_PROG_H -+#define __WE_PROG_H -+ -+int print_to_end_of_buffer(BUFFER *b, char *str, int wrap_limit); -+ -+#endif -+ - #ifdef PROG - - #include -@@ -1477,7 +1484,7 @@ int e_system(char *estr, ECNT *cn) - ret = system(estr); - if (!WpeIsXwin()) - { -- printf(e_msg[ERR_HITCR]); -+ printf("%s",e_msg[ERR_HITCR]); - fflush(stdout); - fk_getch(); - } diff --git a/editors/xwpe/patches/patch-we__term.c b/editors/xwpe/patches/patch-we__term.c deleted file mode 100644 index ea635f3780f6f..0000000000000 --- a/editors/xwpe/patches/patch-we__term.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-we__term.c,v 1.1 2025/06/02 12:54:30 vins Exp $ - -Add missing prototype. - ---- we_term.c.orig 2025-06-02 11:48:21.918716495 +0000 -+++ we_term.c -@@ -97,6 +97,8 @@ char *tgoto(); - #endif - #endif - -+int WpeGpmMouseInit(void); -+ - int WpeDllInit(int *argc, char **argv) - { - fk_u_cursor = fk_t_cursor; diff --git a/editors/xwpe/patches/patch-we__xterm.c b/editors/xwpe/patches/patch-we__xterm.c deleted file mode 100644 index e59ef3e97ef08..0000000000000 --- a/editors/xwpe/patches/patch-we__xterm.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-we__xterm.c,v 1.1 2022/12/08 08:51:56 vins Exp $ - -Fix warning about incompatible pointer type. - ---- we_xterm.c.orig 2005-07-07 01:53:09.000000000 +0000 -+++ we_xterm.c -@@ -95,7 +95,7 @@ int WpeDllInit(int *argc, char **argv) - e_u_ini_size = e_ini_size; - e_u_setlastpic = e_setlastpic; - WpeMouseChangeShape = (void (*)(WpeMouseShape))WpeNullFunction; -- WpeMouseRestoreShape = (void (*)(WpeMouseShape))WpeNullFunction; -+ WpeMouseRestoreShape = WpeNullFunction; - /* WpeMouseChangeShape = WpeXMouseChangeShape; - WpeMouseRestoreShape = WpeXMouseRestoreShape;*/ - WpeDisplayEnd = WpeNullFunction;