Greg Steuck:

> I confirmed that uwm still launches and managed to exercise the Exit
> item in the menu.

Launching an xterm also works.

> Happy to either apply the patch or remove the port as it looks pretty
> dead upstream.

Hey, I was looking at it at the same time.  It's functional, I see
no reason to remove the port.

Here's an update to 0.2.11a, which only updates/fixes the autotools
infrastructure and removes the obsolete HTML documentation.
And the obligatory -fno-common fix.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/uwm/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    12 Jul 2019 20:51:23 -0000      1.5
+++ Makefile    22 Feb 2021 20:22:27 -0000
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.5 2019/07/12 20:51:23 sthen Exp $
 
 COMMENT =      lightweight WM with an original look and feel
-DISTNAME =     uwm-0.2.11
+DISTNAME =     uwm-0.2.11a
 CATEGORIES =   x11
-REVISION =     2
 
 HOMEPAGE =     http://udeproject.sourceforge.net/
 
@@ -23,7 +22,6 @@ CONFIGURE_STYLE =     gnu
 CONFIGURE_ENV =                CPPFLAGS=-I${LOCALBASE}/include \
                        LDFLAGS=-L${LOCALBASE}/lib
 
-FAKE_FLAGS =           udedocdir=${PREFIX}/share/doc/uwm \
-                       udehtmldocdir=${PREFIX}/share/doc/uwm/html
+FAKE_FLAGS =           udedocdir=${PREFIX}/share/doc/uwm
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/uwm/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    20 May 2013 06:38:39 -0000      1.1.1.1
+++ distinfo    22 Feb 2021 20:22:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (uwm-0.2.11.tar.gz) = PV2Jw6OLg56k0tUNf3YHzr2TlZ5loWI7cF7rXoMder8=
-SIZE (uwm-0.2.11.tar.gz) = 473171
+SHA256 (uwm-0.2.11a.tar.gz) = 3QVoV8mLdckgOGGRfbM7yvh7oHS90gTPcyzky3d8tAg=
+SIZE (uwm-0.2.11a.tar.gz) = 633259
Index: patches/patch-uwm_Makefile_in
===================================================================
RCS file: patches/patch-uwm_Makefile_in
diff -N patches/patch-uwm_Makefile_in
--- patches/patch-uwm_Makefile_in       20 May 2013 06:38:39 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-uwm_Makefile_in,v 1.1.1.1 2013/05/20 06:38:39 bcallah Exp $
---- uwm/Makefile.in.orig       Sat May 18 21:17:33 2013
-+++ uwm/Makefile.in    Sat May 18 21:17:50 2013
-@@ -169,7 +169,7 @@ LIBMULTITHREAD = @LIBMULTITHREAD@
- LIBOBJS = @LIBOBJS@
- LIBPTH = @LIBPTH@
- LIBPTH_PREFIX = @LIBPTH_PREFIX@
--LIBS = @LIBS@
-+LIBS = @LIBS@ @LIBINTL@
- LIBTHREAD = @LIBTHREAD@
- LN_S = @LN_S@
- LTLIBC = @LTLIBC@
Index: patches/patch-uwm_workspaces_h
===================================================================
RCS file: patches/patch-uwm_workspaces_h
diff -N patches/patch-uwm_workspaces_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-uwm_workspaces_h      22 Feb 2021 20:22:27 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Comment out unused variables to fix build with -fno-common.
+
+Index: uwm/workspaces.h
+--- uwm/workspaces.h.orig
++++ uwm/workspaces.h
+@@ -94,9 +94,9 @@ typedef struct {
+ 
+ // These three lists will be declared in workspaces.c, and declared static
+ // so that no other module has direct access to them
+-NodeList Workspaces;
+-NodeList Layers;
+-NodeList WS_Layer_Defaults; // This will be the list which handles setting up
++//NodeList Workspaces;
++//NodeList Layers;
++//NodeList WS_Layer_Defaults; // This will be the list which handles setting 
up
+                                                       // defaults for where 
windows will be mapped to.
+ // End three listings
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/uwm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   20 May 2013 06:38:39 -0000      1.1.1.1
+++ pkg/PLIST   22 Feb 2021 20:22:27 -0000
@@ -2,33 +2,6 @@
 @bin bin/uwm
 share/doc/uwm/
 share/doc/uwm/README
-share/doc/uwm/html/
-share/doc/uwm/html/contents.gif
-share/doc/uwm/html/crossref.gif
-share/doc/uwm/html/index.html
-share/doc/uwm/html/manual.css
-share/doc/uwm/html/manual.html
-share/doc/uwm/html/next.gif
-share/doc/uwm/html/next_g.gif
-share/doc/uwm/html/node1.html
-share/doc/uwm/html/node10.html
-share/doc/uwm/html/node11.html
-share/doc/uwm/html/node12.html
-share/doc/uwm/html/node13.html
-share/doc/uwm/html/node14.html
-share/doc/uwm/html/node15.html
-share/doc/uwm/html/node2.html
-share/doc/uwm/html/node3.html
-share/doc/uwm/html/node4.html
-share/doc/uwm/html/node5.html
-share/doc/uwm/html/node6.html
-share/doc/uwm/html/node7.html
-share/doc/uwm/html/node8.html
-share/doc/uwm/html/node9.html
-share/doc/uwm/html/prev.gif
-share/doc/uwm/html/prev_g.gif
-share/doc/uwm/html/up.gif
-share/doc/uwm/html/up_g.gif
 share/doc/uwm/l2h.conf
 share/doc/uwm/manual.pdf
 share/doc/uwm/manual.tex
-- 
Christian "naddy" Weisgerber                          [email protected]

Reply via email to