From 4db449c8a1777284798e314518f29c65d046f3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
Date: Wed, 2 Sep 2020 10:05:06 +0000
Subject: x11-clocks/wmbinclock: fix build in current

Another case of -fno-common issue.

While here, add a couple of missing xorg modules and remove a noop REINPLACE_CMD

PR:	249048
Submitted by:	logix@foobar.franken.de
MFH:	2020Q3 (build fix, -fno-common)
---
 x11-clocks/wmbinclock/Makefile                 |  3 +-
 x11-clocks/wmbinclock/files/patch-wmBinClock.c | 76 ++++++++++++++++++++++++++
 x11-clocks/wmbinclock/files/patch-xutils.c     | 15 +++++
 x11-clocks/wmbinclock/files/patch-xutils.h     | 18 ++++++
 4 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 x11-clocks/wmbinclock/files/patch-wmBinClock.c
 create mode 100644 x11-clocks/wmbinclock/files/patch-xutils.c
 create mode 100644 x11-clocks/wmbinclock/files/patch-xutils.h

(limited to 'x11-clocks')

diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 0033b34efea8..f5cf6a81479c 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -16,10 +16,9 @@ GH_ACCOUNT=	engerim42
 
 PLIST_FILES=	bin/wmBinClock
 USES=		gmake xorg
-USE_XORG=	xpm
+USE_XORG=	x11 xext xpm
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c
 	@${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile
 
diff --git a/x11-clocks/wmbinclock/files/patch-wmBinClock.c b/x11-clocks/wmbinclock/files/patch-wmBinClock.c
new file mode 100644
index 000000000000..583e427b64e3
--- /dev/null
+++ b/x11-clocks/wmbinclock/files/patch-wmBinClock.c
@@ -0,0 +1,76 @@
+--- wmBinClock.c.orig	2015-12-06 01:59:53 UTC
++++ wmBinClock.c
+@@ -58,8 +58,9 @@ int GotFirstClick1, GotDoubleClick1;
+ int GotFirstClick2, GotDoubleClick2;
+ int GotFirstClick3, GotDoubleClick3;
+ int DblClkDelay;
++extern Display		*display;
+ 
+-void IntToBinary(int x, int *str[]);
++void IntToBinary(int x, int *str);
+ void PrintHelp(char err[]);
+ 
+ int main(int argc, char *argv[])
+@@ -660,7 +661,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 
+ 	    tmp_hour = tmworld->tm_hour;
+-	    IntToBinary(tmp_hour, &tmp_str);
++	    IntToBinary(tmp_hour, tmp_str);
+ 
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -671,7 +672,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 
+ 	    tmp_minute = tmworld->tm_min;
+-	    IntToBinary(tmp_minute, &tmp_str);
++	    IntToBinary(tmp_minute, tmp_str);
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+ 		if (tmp_str[s] == 1)
+@@ -681,7 +682,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 	
+ 	    tmp_second = tmworld->tm_sec;
+-	    IntToBinary(tmp_second, &tmp_str);
++	    IntToBinary(tmp_second, tmp_str);
+ 	    
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -692,7 +693,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 	    
+ 	    tmp_day = tmworld->tm_mday;
+-	    IntToBinary(tmp_day, &tmp_str);
++	    IntToBinary(tmp_day, tmp_str);
+ 	    
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -703,7 +704,7 @@ int main(int argc, char *argv[])
+ 	    }
+ 
+ 	    tmp_month = tmworld->tm_mon + 1;
+-	    IntToBinary(tmp_month, &tmp_str);
++	    IntToBinary(tmp_month, tmp_str);
+ 	    
+ 	    for (s = 0; s < 6; s++)
+ 	    {
+@@ -773,7 +774,7 @@ int main(int argc, char *argv[])
+ 	usleep(DELAY);
+     }
+ }
+-void IntToBinary(int x, int *str[])
++void IntToBinary(int x, int *str)
+ {
+     int i = 0;
+     int counter = 0;
+@@ -884,7 +885,7 @@ void PrintHelp(char err[])
+ 	strcpy(str,"Error in ");
+ 	strcat(str,err);
+ 	strcat(str,".\n\n");
+-	printf(str);
++	printf("%s", str);
+     }
+ 
+     printf("Usage: wmBinClock [OPTIONS]\n\n");
diff --git a/x11-clocks/wmbinclock/files/patch-xutils.c b/x11-clocks/wmbinclock/files/patch-xutils.c
new file mode 100644
index 000000000000..ed6de96c68a8
--- /dev/null
+++ b/x11-clocks/wmbinclock/files/patch-xutils.c
@@ -0,0 +1,15 @@
+--- xutils.c.orig	2015-12-06 01:59:53 UTC
++++ xutils.c
+@@ -52,6 +52,12 @@ char		*Geometry = "";
+ XpmIcon		wmgen;
+ Pixmap		pixmask;
+ 
++Display		*display;
++Window          Root;
++Window          iconwin, win;
++int             screen; 
++int             DisplayDepth;
++GC NormalGC;
+ 
+ 
+ 
diff --git a/x11-clocks/wmbinclock/files/patch-xutils.h b/x11-clocks/wmbinclock/files/patch-xutils.h
new file mode 100644
index 000000000000..71d2124b3bb9
--- /dev/null
+++ b/x11-clocks/wmbinclock/files/patch-xutils.h
@@ -0,0 +1,18 @@
+--- xutils.h.orig	2015-12-06 01:59:53 UTC
++++ xutils.h
+@@ -15,15 +15,6 @@ typedef struct {
+ 
+ 
+ 
+-/*
+- *   Global variable
+- */
+-Display		*display;
+-Window          Root;
+-Window          iconwin, win;
+-int             screen; 
+-int             DisplayDepth;
+-GC NormalGC;
+ 
+ 
+ 
-- 
cgit v1.2.3