Hi,

Fix taken from Debian [0], with a patch refresh.

While here, HOMEPAGE and MASTER_SITES are not reachable, use the
dockapps archive [1]. Checksum is still the same.

OK? 

Charlène.


[0]
https://sources.debian.org/patches/wmcalclock/1.25-16.1/05-fix-ftbfs.patch/
[1]  https://www.dockapps.net/


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wmcalclock/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    29 Jan 2021 22:45:00 -0000
@@ -4,16 +4,16 @@ COMMENT=              wm-dockapp; calendar/clock
 
 DISTNAME=              wmCalClock-1.25
 PKGNAME=               ${DISTNAME:L}
-REVISION=              1
+REVISION=              2
 CATEGORIES=            x11 x11/windowmaker
 
-HOMEPAGE=              http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+HOMEPAGE=              https://www.dockapps.net/wmcalclock
 
 # GPL
 PERMIT_PACKAGE=        Yes
 WANTLIB=               X11 Xext Xpm c
 
-MASTER_SITES=          http://nis-www.lanl.gov/~mgh/WindowMaker/
+MASTER_SITES=          https://www.dockapps.net/download/
 
 NO_TEST=               Yes
 
Index: patches/patch-Src_xutils_c
===================================================================
RCS file: patches/patch-Src_xutils_c
diff -N patches/patch-Src_xutils_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Src_xutils_c  29 Jan 2021 22:45:00 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: Src/xutils.c
+--- Src/xutils.c.orig
++++ Src/xutils.c
+@@ -53,6 +53,11 @@ GC          NormalGC;
+ XpmIcon               wmgen;
+ Pixmap                pixmask;
+ 
++Display               *display;
++Window                Root;
++Window                iconwin, win;
++int           screen;
++int           DisplayDepth;
+ 
+ /*
+  *  Colors for wmCalClock
Index: patches/patch-Src_xutils_h
===================================================================
RCS file: patches/patch-Src_xutils_h
diff -N patches/patch-Src_xutils_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Src_xutils_h  29 Jan 2021 22:45:00 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Fix -fno-common build failure
+
+Index: Src/xutils.h
+--- Src/xutils.h.orig
++++ Src/xutils.h
+@@ -18,11 +18,11 @@ typedef struct {
+ /*
+  *   Global variable
+  */
+-Display               *display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
++extern Display                *display;
++extern Window         Root;
++extern Window         iconwin, win;
++extern int            screen;
++extern int            DisplayDepth;
+ 
+ 
+ 
Index: patches/patch-wmCalClock_c
===================================================================
RCS file: /cvs/ports/x11/wmcalclock/patches/patch-wmCalClock_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-wmCalClock_c
--- patches/patch-wmCalClock_c  3 Jan 2001 14:05:15 -0000       1.1.1.1
+++ patches/patch-wmCalClock_c  29 Jan 2021 22:45:00 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-wmCalClock_c,v 1.1.1.1 2001/01/03 14:05:15 naddy Exp $
---- Src/wmCalClock.c.orig      Fri Jul  2 23:01:35 1999
-+++ Src/wmCalClock.c   Thu Dec 21 17:51:39 2000
+Index: Src/wmCalClock.c
+--- Src/wmCalClock.c.orig
++++ Src/wmCalClock.c
 @@ -299,7 +299,7 @@ int main(int argc, char *argv[]) {
      int                       i, n, wid, extrady, extradx;
      int               Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth;
@@ -37,7 +38,7 @@ $OpenBSD: patch-wmCalClock_c,v 1.1.1.1 2
            HasExecute = 1;
  
          } else if (!strcmp(argv[i], "-g")){
-@@ -999,7 +999,7 @@ void ButtonPressEvent(XButtonEvent *xev)
+@@ -999,7 +999,7 @@ void ButtonPressEvent(XButtonEvent *xev){
      if (GotDoubleClick1) {
          GotFirstClick1 = 0;
          GotDoubleClick1 = 0;

Reply via email to