x11/wmdate: fix with the new devel/libdockapp (3/4)

This has been tested successfully on macppc and amd64. If you don't use
windowmaker, you'll need to use the '-w' option.

A vintage patch got refreshed while here.

Comments/feedback are welcome,

Charlène.


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmdate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 12 Jul 2019 20:51:24 -0000 1.23
+++ Makefile 1 Feb 2021 01:27:06 -0000
@@ -3,7 +3,7 @@
COMMENT= wm-dockapp; shows the current date

DISTNAME= wmdate-0.7
-REVISION= 3
+REVISION= 4
CATEGORIES= x11 x11/windowmaker

# BSD
@@ -11,7 +11,7 @@ PERMIT_PACKAGE= Yes

WANTLIB= X11 Xau Xdmcp Xext Xpm c dockapp

-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3

NO_TEST= Yes
CONFIGURE_STYLE= imake noman
Index: patches/patch-Imakefile
===================================================================
RCS file: /cvs/ports/x11/wmdate/patches/patch-Imakefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Imakefile
--- patches/patch-Imakefile 16 Jan 2001 22:10:15 -0000 1.1.1.1
+++ patches/patch-Imakefile 1 Feb 2021 01:27:06 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/01/16 22:10:15 naddy Exp $
---- Imakefile.orig Mon May 17 22:36:35 1999
-+++ Imakefile Tue Jan 16 16:41:43 2001
+Index: Imakefile
+--- Imakefile.orig
++++ Imakefile
@@ -89,8 +89,7 @@ XCOMM

MASTERXPM = xpm/$(MASTER_XPM).xpm
@@ -11,7 +12,7 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001
-L. \
-ldockapp \
-lXpm -lXext -lX11
-@@ -132,7 +131,7 @@ XCOMM ----------------------------------
+@@ -132,7 +131,7 @@ XCOMM ---------------------------------------
XCOMM Create Makefile
XCOMM ---------------------------------------

Index: patches/patch-wmdate_c
===================================================================
RCS file: /cvs/ports/x11/wmdate/patches/patch-wmdate_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-wmdate_c
--- patches/patch-wmdate_c 16 Jan 2001 22:10:16 -0000 1.1.1.1
+++ patches/patch-wmdate_c 1 Feb 2021 01:27:06 -0000
@@ -1,9 +1,25 @@
$OpenBSD: patch-wmdate_c,v 1.1.1.1 2001/01/16 22:10:16 naddy Exp $
---- wmdate.c.orig Mon May 17 22:25:23 1999
-+++ wmdate.c Tue Jan 16 16:35:36 2001
-@@ -95,7 +95,7 @@ main (int argc, char *argv[])
+
+Hunk #1: fix with libdockapp>=0.7
+
+Index: wmdate.c
+--- wmdate.c.orig
++++ wmdate.c
+@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
+ #include <X11/extensions/shape.h>
+ #include <time.h>
+
+-#include <dockapp.h>
++#include <libdockapp/dockapp.h>
+ #include "config.h"
+ #include "geometry.h"
+
+@@ -93,9 +93,9 @@ main (int argc, char *argv[])
+ Pixmap disp; /* Pixmap that is actually displayed */
+ unsigned long fore_pix, back_pix;
int old_day;
- unsigned int w=183, h=84;
+- unsigned int w=183, h=84;
++ unsigned short w=183, h=84;

- DAParseArguments(argc, argv, options, 4, DESCRIPTION, VERSION);
+ DAParseArguments(argc, argv, options, 3, DESCRIPTION, VERSION);