This has been tested on amd64 and macppc. To potential testers, if
you're not using windowmaker, you'll need to use the '-w' option.

Comments/feedback are welcome,

Charlène.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wmnetload/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile    12 Jul 2019 20:48:52 -0000      1.15
+++ Makefile    1 Feb 2021 01:31:12 -0000
@@ -3,7 +3,7 @@
 COMMENT=               wm-dockapp; simple network interface monitoring tool
 
 DISTNAME=              wmnetload-1.3
-REVISION=              4
+REVISION=              5
 CATEGORIES=            net x11 x11/windowmaker
 
 HOMEPAGE=              http://freshmeat.net/projects/wmnetload
@@ -14,7 +14,7 @@ WANTLIB=              X11 Xext Xpm c m dockapp
 
 MASTER_SITES=          ftp://truffula.com/pub/
 
-LIB_DEPENDS=           devel/libdockapp
+LIB_DEPENDS=           devel/libdockapp>=0.7.3
 
 SEPARATE_BUILD=                Yes
 CONFIGURE_STYLE=       gnu
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/wmnetload/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure     7 Dec 2015 14:58:54 -0000       1.2
+++ patches/patch-configure     1 Feb 2021 01:31:12 -0000
@@ -1,6 +1,10 @@
 $OpenBSD: patch-configure,v 1.2 2015/12/07 14:58:54 jasper Exp $
---- configure.orig     Sun Feb 23 10:08:00 2003
-+++ configure  Mon Dec  7 14:35:10 2015
+
+Hunk #2, 3: fix the build with libdockapp>=0.7
+
+Index: configure
+--- configure.orig
++++ configure
 @@ -3052,6 +3052,9 @@ case $host_os in
        OS=freebsd
        LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
@@ -11,3 +15,21 @@ $OpenBSD: patch-configure,v 1.2 2015/12/
  *)
        echo ""
        echo "Sorry, $host_os is not supported yet."
+@@ -4713,7 +4716,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -4748,7 +4751,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Index: patches/patch-src_wmnetload_c
===================================================================
RCS file: patches/patch-src_wmnetload_c
diff -N patches/patch-src_wmnetload_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_wmnetload_c       1 Feb 2021 01:31:12 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Hunk #1: Unbreak with libdockapp>=0.7
+Hunk #2: fix text display that was blank
+
+Index: src/wmnetload.c
+--- src/wmnetload.c.orig
++++ src/wmnetload.c
+@@ -37,7 +37,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+ #endif
+@@ -1051,7 +1051,7 @@ static void
+ setshape(void)
+ {
+       Pixmap mask, pixmap;
+-      unsigned int h, w;
++      unsigned short h, w;
+ 
+       if (DAMakePixmapFromData(backlight_off_xpm, &pixmap, &mask, &h, &w)) {
+               DASetShape(mask);

Reply via email to