Attachment 272044 Details for Bug 296205 – devel/xwpe 1.5.30a -> 1.6.6 (git diff)

[patch] devel/xwpe 1.5.30a -> 1.6.6 (git diff)

xwpe-1.6.6.diff (text/plain), 9.46 KB, created by Juan M. Méndez Rey on 2026-06-22 15:14:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Juan M. Méndez Rey

Created: 2026-06-22 15:14:40 UTC

Size: 9.46 KB

patch

obsolete

>diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
>index 758701a..35500ab 100644
>--- a/devel/xwpe/Makefile
>+++ b/devel/xwpe/Makefile
>@@ -1,30 +1,24 @@
> PORTNAME=	xwpe
>-PORTVERSION=	1.5.30a
>-PORTREVISION=	1
>+DISTVERSION=	1.6.6
> CATEGORIES=	devel
>-MASTER_SITES=	SUNSITE/apps/editors/X \
>-		http://www.identicalsoftware.com/xwpe/ \
>-		ftp://ftp.identicalsoftware.com/pub/linux/xwpe/
>+MASTER_SITES=	https://codeberg.org/mendezr/xwpe/releases/download/v${DISTVERSION}/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Borland-like IDE programming environment
>-WWW=		http://www.identicalsoftware.com/xwpe/
>+WWW=		https://codeberg.org/mendezr/xwpe
> 
>-USES=		desthack ncurses xorg
>-DESTDIRNAME=	STAGEDIR
>-USE_XORG=	sm ice x11
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--libdir=\$${STAGEDIR}${PREFIX}/share
>-ALL_TARGET=	# none
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+LIB_DEPENDS=	libvterm.so:devel/libvterm \
>+		libjson-c.so:devel/json-c \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
> 
>-post-patch:
>-.for file in we_prog.c we_fl_unix.c
>-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
>-		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${file}
>-.endfor
>-	${REINPLACE_CMD} -e 's|$$(INSTALL_PROGRAM)|${INSTALL_PROGRAM}|g' \
>-	    ${WRKSRC}/Makefile.in
>-	${REINPLACE_CMD} -e 's|$$(INSTALL_DATA)|${INSTALL_DATA}|g' \
>-	    ${WRKSRC}/Makefile.in
>+USES=		desktop-file-utils gmake gnome localbase ncurses pkgconfig xorg
>+USE_GNOME=	cairo pango
>+USE_XORG=	x11 xext xft
>+GNU_CONFIGURE=	yes
>+INFO=		xwpe
> 
> .include <bsd.port.mk>
>diff --git a/devel/xwpe/distinfo b/devel/xwpe/distinfo
>index 1cb6f25..7d27c8a 100644
>--- a/devel/xwpe/distinfo
>+++ b/devel/xwpe/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (xwpe-1.5.30a.tar.gz) = fce37a5dd3afd7102a73d187eda8b9d1ab88bf5db649f385b8cd13e72e0c7961
>-SIZE (xwpe-1.5.30a.tar.gz) = 325043
>+TIMESTAMP = 1750000000
>+SHA256 (xwpe-1.6.6.tar.gz) = 36b4c54677c03b6d5eac12130a8674ee6c9afcdce719d227d276ca96e9b99d1b
>+SIZE (xwpe-1.6.6.tar.gz) = 1207219
>diff --git a/devel/xwpe/files/patch-02 b/devel/xwpe/files/patch-02
>deleted file mode 100644
>index 24dde24..0000000
>--- a/devel/xwpe/files/patch-02
>+++ /dev/null
>@@ -1,64 +0,0 @@
>---- Makefile.in.orig	Mon Dec 27 08:11:38 1999
>-+++ Makefile.in	Sat Feb 26 05:32:22 2000
>-@@ -16,8 +16,10 @@
>- 
>- LIBS=@LIBS@
>- XLIBS=@X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
>--DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DSELECTION
>--INSTALL=	cp
>-+DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DX_INC=\"@X_INC@\"
>-+INSTALL=	@INSTALL@
>-+INSTALL_PROGRAM=	@INSTALL_PROGRAM@
>-+INSTALL_DATA=	@INSTALL_DATA@
>- LN_S=	@LN_S@
>- 
>- # In case configure fails a description of many of the compilation options
>-@@ -118,38 +120,29 @@
>- 	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
>-+	$(INSTALL_PROGRAM) xwpe $(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
>-+	  $(INSTALL_DATA) syntax_def $(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 
>-+	$(INSTALL_DATA) xwe.1 wpe.1 we.1 $(MANDIR)/man1
>- 	if test -f libxwpe-x11.so; then \
>--	  $(INSTALL) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi
>-+	  $(INSTALL_DATA) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi
>- 	if test -f libxwpe-term.so; then \
>--	  $(INSTALL) libxwpe-term.so $(XWPELIBDIR)/libxwpe-term.so; fi
>-+	  $(INSTALL_DATA) libxwpe-term.so $(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
>-+	$(INSTALL_DATA) help.xwpe_eng $(XWPELIBDIR)/help.xwpe
>-+	$(INSTALL_DATA) help.key_eng $(XWPELIBDIR)/help.key
>-+	$(INSTALL_DATA) xwpe.1_eng $(MANDIR)/man1/xwpe.1
>- 
>- # German install uses old documention as no updated version is available
>- install_german:	install_fst
>--	$(INSTALL) old/we.help_gr $(XWPELIBDIR)/help.xwpe
>--	chmod ugo=r $(XWPELIBDIR)/help.xwpe
>--	$(INSTALL) old/xwpe.1_gr $(MANDIR)/man1/xwpe.1
>--	chmod ugo=r $(MANDIR)/man1/xwpe.1
>-+	$(INSTALL_DATA) old/we.help_gr $(XWPELIBDIR)/help.xwpe
>-+	$(INSTALL_DATA) old/xwpe.1_gr $(MANDIR)/man1/xwpe.1
>- 
>diff --git a/devel/xwpe/files/patch-05 b/devel/xwpe/files/patch-05
>deleted file mode 100644
>index 0c7dcb3..0000000
>--- a/devel/xwpe/files/patch-05
>+++ /dev/null
>@@ -1,25 +0,0 @@
>---- we_prog.c.orig	Mon Dec 27 08:11:38 1999
>-+++ we_prog.c	Sat Feb 26 07:48:25 2000
>-@@ -16,6 +16,9 @@
>- #include <sys/stat.h>
>- #include <sys/wait.h>
>- #include <signal.h>
>-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
>-+#include <sys/param.h>
>-+#endif
>- 
>- int e_run_sh(FENSTER *f);
>- int e_make_library(char *library, char *ofile, FENSTER *f);
>-@@ -924,7 +927,11 @@
>-  e_prog.exedir = WpeStrdup(".");
>-  if (e_prog.sys_include) FREE(e_prog.sys_include);
>-  e_prog.sys_include =
>--   WpeStrdup("/usr/include:/usr/local/include:/usr/include/X11");
>-+   WpeStrdup("/usr/include:%%LOCALBASE%%/include"
>-+#if !defined(NO_XWINDOWS)
>-+			 ":"X_INC
>-+#endif
>-+			);
>-  if (e_prog.comp == NULL)
>-   e_prog.comp = MALLOC(e_prog.num * sizeof(struct e_s_prog *));
>-  else
>diff --git a/devel/xwpe/files/patch-09 b/devel/xwpe/files/patch-09
>deleted file mode 100644
>index 2b956ba..0000000
>--- a/devel/xwpe/files/patch-09
>+++ /dev/null
>@@ -1,27 +0,0 @@
>---- we_fl_unix.c.orig	Wed Jun  5 11:53:50 2002
>-+++ we_fl_unix.c	Fri Jul 12 02:37:37 2002
>-@@ -13,6 +13,10 @@
>- #include <sys/stat.h>
>- #include <errno.h>
>- 
>-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
>-+#include <sys/param.h>
>-+#endif
>-+
>- struct dirfile *e_make_win_list(FENSTER * f);
>- extern char    *e_tmp_dir;
>- 
>-@@ -3532,7 +3536,12 @@
>-  }
>-  if ((!manpath) || (manpath[0] == '\0'))
>-  {
>--  manpath = strdup("/usr/man:/usr/share/man:/usr/X11R6/man:/usr/local/man");
>-+  manpath = strdup(
>-+#if (defined(BSD) && (BSD >= 199306)) || (defined(sun) && defined(__svr4__))
>-+		"/usr/share/man:%%LOCALBASE%%/man:%%LOCALBASE%%/man");
>-+#else
>-+		"/usr/man:%%LOCALBASE%%/man:%%LOCALBASE%%/man");
>-+#endif
>-  }
>-  /* Allocate the maximum possible rather than continually realloc. */
>-  sustr = malloc(strlen(manpath) + 10);
>diff --git a/devel/xwpe/files/patch-we_xterm.c b/devel/xwpe/files/patch-we_xterm.c
>deleted file mode 100644
>index f83bca2..0000000
>--- a/devel/xwpe/files/patch-we_xterm.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- we_xterm.c.orig	2008-03-19 17:50:00.000000000 +0100
>-+++ we_xterm.c	2008-03-19 17:52:02.000000000 +0100
>-@@ -95,7 +95,7 @@
>-  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;
>diff --git a/devel/xwpe/pkg-descr b/devel/xwpe/pkg-descr
>index a96e63d..38ca5e9 100644
>--- a/devel/xwpe/pkg-descr
>+++ b/devel/xwpe/pkg-descr
>@@ -1,16 +1,7 @@
>-xwpe is a X-window programming environment designed for UNIX systems.
>-It is similar to 'Borland C++' MS-DOS programming IDE environment.
>-
>-xwpe supports many compilers, linkers, and debuggers, so you are not tied to
>-any particular set of tools.  There is both a curses and X11 interface
>-(the later with mouse support).
>-
>-Errors that occur while compiling and linking a program can be examined in
>-the sources -- the cursor will jump to the corresponding line in the
>-source file.   Programs composed of more than one source file, can be
>-managed with the project-option.  Your program may be run and debugged from
>-within xwpe -- allowing the user to set breakpoints and watch variables.
>-
>-Note:  there are both English and German language version of the man pages,
>-and help files.  The German language version will be installed if
>-"GERMAN_LANG" is set during ``make install'' of the port.
>+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/devel/xwpe/pkg-plist b/devel/xwpe/pkg-plist
>index 6401eaa..5b901b2 100644
>--- a/devel/xwpe/pkg-plist
>+++ b/devel/xwpe/pkg-plist
>@@ -2,10 +2,13 @@ bin/we
> bin/wpe
> bin/xwe
> bin/xwpe
>+lib/xwpe/help.key
>+lib/xwpe/help.xwpe
>+lib/xwpe/syntax_def
>+share/applications/xwpe.desktop
>+share/icons/hicolor/scalable/apps/xwpe.svg
> share/man/man1/we.1.gz
> share/man/man1/wpe.1.gz
> share/man/man1/xwe.1.gz
> share/man/man1/xwpe.1.gz
>-%%DATADIR%%/help.key
>-%%DATADIR%%/help.xwpe
>-%%DATADIR%%/syntax_def
>+share/metainfo/io.codeberg.mendezr.xwpe.metainfo.xml

Actions: View | Diff

Attachments on bug 296205: 272044 | 272586