xwpe moved to a new upstream (https://codeberg.org/mendezr/xwpe


The previous maintainer, Dennis Payne, gave the blessing and documented it at 
the beginning of: https://identicalsoftware.com/xwpe/

The latest release is 1.6.6.

The changes that are relevant for OpenBSD are:

-   patches/ are upstreamed (1.6.6 is a normal autotools build)- 
files/xwpe.desktop and files/xwpe.xpm are now obsolete (upstream now installs 
its own .desktop, a scalable SVG icon and AppStream metainfo)
    
- new deps for the modern X11 UI + embedded terminal + LSP/DAP features: 
devel/json-c, devel/libvterm, graphics/cairo, devel/pango
(X11, Xft and curses come from base; SM/ICE are no longer linked)

I built it in a 7.4 amd64 VM: it compiles and links, port-lib-depends-check
is happy with the WANTLIB in the diff, and pkg/PLIST is what update-plist 
produced. I am glad to modify to your taste.

        
Best,
Juan

Tarball: 
https://codeberg.org/mendezr/xwpe/releases/download/v1.6.6/xwpe-1.6.6.tar.gz


Diff against the ports tree (also attached as openbsd-editors-xwpe-1.6.6.diff):


diff --git editors/xwpe/Makefile editors/xwpe/Makefile
index b7471b6..f197734 100644
--- editors/xwpe/Makefile
+++ editors/xwpe/Makefile
@@ -1,24 +1,30 @@
-COMMENT=       powerful programming editor
+COMMENT =      powerful programming editor
 
-DISTNAME=      xwpe-1.5.30a
-REVISION=      3
-CATEGORIES=    editors
+V =            1.6.6
+DISTNAME =     xwpe-${V}
+CATEGORIES =   editors
 
-SITES=         ${SITE_SUNSITE:=apps/editors/X/} \
-               http://www.identicalsoftware.com/xwpe/ 
+HOMEPAGE =     https://codeberg.org/mendezr/xwpe
 
 # GPLv2
-PERMIT_PACKAGE=        Yes
+PERMIT_PACKAGE =       Yes
 
-WANTLIB=               ICE SM X11 c curses xcb z
+SITES =                
https://codeberg.org/mendezr/xwpe/releases/download/v${V}/
 
-ALL_TARGET=    xwpe
+WANTLIB += X11 Xext Xft c cairo curses fontconfig freetype
+WANTLIB += glib-2.0 gobject-2.0 harfbuzz json-c m pango-1.0 pangocairo-1.0
+WANTLIB += util vterm z
 
-CONFIGURE_STYLE=gnu
-DESTDIRNAME=   none
-MAKE_FLAGS=    CFLAGS='${CFLAGS} -I${X11BASE}/include'
-FAKE_FLAGS=    prefix=${WRKINST}${PREFIX} MANDIR=${WRKINST}${PREFIX}/man
+LIB_DEPENDS =  devel/json-c \
+               devel/libvterm \
+               graphics/cairo \
+               devel/pango
 
-NO_TEST=       Yes
+CONFIGURE_STYLE =      gnu
+CONFIGURE_ARGS =       --without-gpm
+USE_GMAKE =            Yes
+
+# xwpe uses base wide-char curses on OpenBSD (no ncursesw port); the configure
+# script's direct-link probe finds it.
 
 .include <bsd.port.mk>
diff --git editors/xwpe/distinfo editors/xwpe/distinfo
index d305940..1859407 100644
--- editors/xwpe/distinfo
+++ editors/xwpe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xwpe-1.5.30a.tar.gz) = /ON6XdOv1xAqc9GH7ai50auIv122SfOFuM0T5y4MeWE=
-SIZE (xwpe-1.5.30a.tar.gz) = 325043
+SHA256 (xwpe-1.6.6.tar.gz) = NrTFRnfAO21erBITCoZ07mya/NznGdIn0nbKlum5nRs=
+SIZE (xwpe-1.6.6.tar.gz) = 1207219
diff --git editors/xwpe/patches/patch-Makefile_in 
editors/xwpe/patches/patch-Makefile_in
deleted file mode 100644
index b16b20e..0000000
--- editors/xwpe/patches/patch-Makefile_in
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in.orig   Mon Dec 27 00:11:38 1999
-+++ Makefile.in        Fri Oct 26 22:47:33 2007
-@@ -13,10 +13,11 @@ DESTDIR=@bindir@
- LIBDIR=@libdir@
- XWPELIBDIR=   $(LIBDIR)/xwpe
- MANDIR=@mandir@
-+INFODIR=$(prefix)/info
- 
- LIBS=@LIBS@
- XLIBS=@X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
--DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DSELECTION
-+DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DSELECTION -DX_INC=\"@X_INC@\"
- INSTALL=      cp
- LN_S= @LN_S@
- 
diff --git editors/xwpe/patches/patch-configure 
editors/xwpe/patches/patch-configure
deleted file mode 100644
index 2097286..0000000
--- editors/xwpe/patches/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig     Tue Dec  9 11:39:03 2008
-+++ configure  Tue Dec  9 11:39:05 2008
-@@ -6053,6 +6053,7 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t
- s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
- s,@X_LIBS@,$X_LIBS,;t t
- s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-+s,@X_INC@,$x_includes,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
- s,@LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
diff --git editors/xwpe/patches/patch-we_fl_unix_c 
editors/xwpe/patches/patch-we_fl_unix_c
deleted file mode 100644
index 00c2e2e..0000000
--- editors/xwpe/patches/patch-we_fl_unix_c
+++ /dev/null
@@ -1,16 +0,0 @@
---- we_fl_unix.c.orig  Tue Dec  9 11:35:46 2008
-+++ we_fl_unix.c       Tue Dec  9 11:36:54 2008
-@@ -3532,7 +3532,12 @@ struct dirfile *e_make_funct(char *man)
-  }
-  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:/usr/local/man");
-+#else
-+               "/usr/man:/usr/local/man");
-+#endif
-  }
-  /* Allocate the maximum possible rather than continually realloc. */
-  sustr = malloc(strlen(manpath) + 10);
diff --git editors/xwpe/pkg/DESCR editors/xwpe/pkg/DESCR
index c4c5081..38ca5e9 100644
--- editors/xwpe/pkg/DESCR
+++ editors/xwpe/pkg/DESCR
@@ -1,5 +1,7 @@
-Xwpe is an editor that allows you to write program and compile it
-without exiting that same editor. Xwpe is useful, because of its hudge
-of editing tools. You can compile, run, link, trace, your program as you
-want in it. It is easy to use and allows you to use many compiling
-utilities.
+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 editors/xwpe/pkg/PLIST editors/xwpe/pkg/PLIST
index 9651141..0a2b26a 100644
--- editors/xwpe/pkg/PLIST
+++ editors/xwpe/pkg/PLIST
@@ -1,7 +1,9 @@
+@comment $OpenBSD$
 @bin bin/we
 bin/wpe
 bin/xwe
 bin/xwpe
+@info info/xwpe.info
 lib/xwpe/
 lib/xwpe/help.key
 lib/xwpe/help.xwpe
@@ -10,3 +12,14 @@ lib/xwpe/syntax_def
 @man man/man1/wpe.1
 @man man/man1/xwe.1
 @man man/man1/xwpe.1
+share/applications/
+share/applications/xwpe.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/xwpe.svg
+share/metainfo/
+share/metainfo/io.codeberg.mendezr.xwpe.metainfo.xml
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor

Reply via email to