CVS commit: pkgsrc/editors/xwpe

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Jun  2 12:54:30 UTC 2025

Modified Files:
        pkgsrc/editors/xwpe: Makefile distinfo
        pkgsrc/editors/xwpe/patches: patch-we__prog.c
Added Files:
        pkgsrc/editors/xwpe/patches: patch-we__fl__unix.c patch-we__term.c

Log Message:
editors/xwpe: package revision

* Do not require gmake
* Do not force ncurses
* Silence more warnings


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/editors/xwpe/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/xwpe/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/xwpe/patches/patch-we__fl__unix.c \
    pkgsrc/editors/xwpe/patches/patch-we__term.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/xwpe/patches/patch-we__prog.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xwpe/Makefile
diff -u pkgsrc/editors/xwpe/Makefile:1.18 pkgsrc/editors/xwpe/Makefile:1.19
--- pkgsrc/editors/xwpe/Makefile:1.18   Mon Dec 19 09:02:46 2022
+++ pkgsrc/editors/xwpe/Makefile        Mon Jun  2 12:54:30 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2022/12/19 09:02:46 vins Exp $
+# $NetBSD: Makefile,v 1.19 2025/06/02 12:54:30 vins Exp $
 #
 
 DISTNAME=      xwpe-1.5.30a
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  http://www.identicalsoftware.com/xwpe/
 
@@ -11,9 +12,6 @@ COMMENT=      Programming environment for UNI
 LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake
-INCOMPAT_CURSES+=      NetBSD-[0-5].*-* #tigetstr
-FAKE_NCURSES=          yes
 
 BUILD_TARGET=          # the one from the Makefile
 
@@ -23,14 +21,12 @@ INSTALLATION_DIRS+= share/applications
 INSTALLATION_DIRS+=    share/pixmaps
 
 post-install:
-# Run acme as a standalone application.
        ${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/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"

Index: pkgsrc/editors/xwpe/distinfo
diff -u pkgsrc/editors/xwpe/distinfo:1.10 pkgsrc/editors/xwpe/distinfo:1.11
--- pkgsrc/editors/xwpe/distinfo:1.10   Thu Dec  8 10:31:07 2022
+++ pkgsrc/editors/xwpe/distinfo        Mon Jun  2 12:54:30 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2022/12/08 10:31:07 vins Exp $
+$NetBSD: distinfo,v 1.11 2025/06/02 12:54:30 vins Exp $
 
 BLAKE2s (xwpe-1.5.30a.tar.gz) = 5e33b6cb1880b38dbf551138e807b18a952d282a41411704ada6fabdb34680d4
 SHA512 (xwpe-1.5.30a.tar.gz) = c5b182f798caeeaa7ba62bd3692690030623d317795d907e4fac3f524f53aa299af5d735d9b03185eaa07526f0146c4fa8d09efbbab6790f5e329fd52359b797
@@ -7,6 +7,8 @@ SHA1 (patch-WeXterm.c) = d60a373aafdcc58
 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) = ec904471c0b1e8e1ee286e7fccbb9351d9a04620
+SHA1 (patch-we__prog.c) = e6de61bc04cf803e722c8f1ec596bb2f29be9693
+SHA1 (patch-we__term.c) = efaf0cdaa21d0370344cd8e89766265e8f9e6e23
 SHA1 (patch-we__xterm.c) = 5b63e0df612ffdff64838d1faf5b558d9179b3dc

Index: pkgsrc/editors/xwpe/patches/patch-we__prog.c
diff -u pkgsrc/editors/xwpe/patches/patch-we__prog.c:1.1 pkgsrc/editors/xwpe/patches/patch-we__prog.c:1.2
--- pkgsrc/editors/xwpe/patches/patch-we__prog.c:1.1    Thu Dec  8 10:31:08 2022
+++ pkgsrc/editors/xwpe/patches/patch-we__prog.c        Mon Jun  2 12:54:30 2025
@@ -1,6 +1,7 @@
-$NetBSD: patch-we__prog.c,v 1.1 2022/12/08 10:31:08 vins Exp $
+$NetBSD: patch-we__prog.c,v 1.2 2025/06/02 12:54:30 vins Exp $
 
-Fix implicit declaration warnings.
+* 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
@@ -18,3 +19,12 @@ Fix implicit declaration warnings.
  #ifdef PROG
  
  #include <time.h>
+@@ -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();
+  }

Added files:

Index: pkgsrc/editors/xwpe/patches/patch-we__fl__unix.c
diff -u /dev/null pkgsrc/editors/xwpe/patches/patch-we__fl__unix.c:1.1
--- /dev/null   Mon Jun  2 12:54:30 2025
+++ pkgsrc/editors/xwpe/patches/patch-we__fl__unix.c    Mon Jun  2 12:54:30 2025
@@ -0,0 +1,15 @@
+$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();
Index: pkgsrc/editors/xwpe/patches/patch-we__term.c
diff -u /dev/null pkgsrc/editors/xwpe/patches/patch-we__term.c:1.1
--- /dev/null   Mon Jun  2 12:54:30 2025
+++ pkgsrc/editors/xwpe/patches/patch-we__term.c        Mon Jun  2 12:54:30 2025
@@ -0,0 +1,15 @@
+$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;