git: 3ed49e6414ed - main - net/wmwave: fix build with -fno-common

The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3ed49e6414ed7ec56e9a2d4683ea3114271bcae3

commit 3ed49e6414ed7ec56e9a2d4683ea3114271bcae3
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-02-09 13:44:12 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-02-14 20:18:56 +0000

    net/wmwave: fix build with -fno-common
    
    While we are at it:
    
     - define LICENSE
     - switch to USES=localbase
     - add missing include for errx()
    
    PR:             267588
    MFH:            2023Q1
    Approved by:    build fix blanket, maintainer timeout
    Approved by:    flo (mentor)
    Differential Revision: https://reviews.freebsd.org/D38511
---
 net/wmwave/Makefile                | 16 ++++++++--------
 net/wmwave/files/patch-wmgeneral.c | 13 +++++++++++++
 net/wmwave/files/patch-wmgeneral.h | 11 +++++++++++
 net/wmwave/files/patch-wmwave.c    | 22 +++++++++++++++-------
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/net/wmwave/Makefile b/net/wmwave/Makefile
index 622f3e71ea5a..1bcc8487881e 100644
--- a/net/wmwave/Makefile
+++ b/net/wmwave/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	wmwave
 DISTVERSION=	0-4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	benjsc@FreeBSD.org
 COMMENT=	Display 802.11 status in the WindowMaker Dock
-WWW=		http://www.schuermann.org/~dockapps/
+WWW=		https://sourceforge.net/projects/wmwave/
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: display
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: display
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		xorg
-USE_XORG=	xpm
+USES=		localbase:ldflags xorg
+USE_XORG=	x11 xext xpm
 
 PLIST_FILES=	bin/wmwave man/man1/wmwave.1.gz
 WRKSRC=		${WRKDIR}/${PORTNAME}
-CFLAGS+=	-DWICACHE -I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib -lX11 -lXpm -lXext -lm
+CFLAGS+=	-DWICACHE
+LDFLAGS+=	-lX11 -lXpm -lXext -lm
 
 do-build:
 	${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/wmgeneral.c \
diff --git a/net/wmwave/files/patch-wmgeneral.c b/net/wmwave/files/patch-wmgeneral.c
new file mode 100644
index 000000000000..3e9c321ee2d4
--- /dev/null
+++ b/net/wmwave/files/patch-wmgeneral.c
@@ -0,0 +1,13 @@
+--- wmgeneral.c.orig	2022-11-06 10:29:50 UTC
++++ wmgeneral.c
+@@ -65,8 +65,9 @@
+ /* X11 Variables */
+ /*****************/
+ 
++Display		*display;
+ Window		Root;
+-int			screen;
++extern int			screen;
+ int			x_fd;
+ int			d_depth;
+ XSizeHints	mysizehints;
diff --git a/net/wmwave/files/patch-wmgeneral.h b/net/wmwave/files/patch-wmgeneral.h
new file mode 100644
index 000000000000..0a12cdfd6304
--- /dev/null
+++ b/net/wmwave/files/patch-wmgeneral.h
@@ -0,0 +1,11 @@
+--- wmgeneral.h.orig	2022-11-06 10:29:16 UTC
++++ wmgeneral.h
+@@ -36,7 +36,7 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
diff --git a/net/wmwave/files/patch-wmwave.c b/net/wmwave/files/patch-wmwave.c
index 3e4d6832d4f7..984d32f0ad0a 100644
--- a/net/wmwave/files/patch-wmwave.c
+++ b/net/wmwave/files/patch-wmwave.c
@@ -1,5 +1,5 @@
---- wmwave.c.orig	2008-02-27 09:24:06.628732284 +1030
-+++ wmwave.c	2008-02-27 09:32:07.088117765 +1030
+--- wmwave.c.orig	1999-08-20 13:44:21 UTC
++++ wmwave.c
 @@ -29,6 +29,18 @@
   *
   * Revision 1.1  1999/08/15 15:39:18  carsten
@@ -19,7 +19,15 @@
   *
   */
  
-@@ -57,6 +69,23 @@
+@@ -45,6 +57,7 @@
+ #include <limits.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <err.h>
+ 
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -57,6 +70,23 @@
  #include <X11/xpm.h>
  #include <X11/extensions/shape.h>
  
@@ -43,7 +51,7 @@
  
  #include "wmgeneral.h"
  
-@@ -66,7 +94,9 @@
+@@ -66,7 +96,9 @@ char wmwave_mask_bits[64*64];
  int wmwave_mask_width = 64;
  int wmwave_mask_height = 64;
  
@@ -54,7 +62,7 @@
  
  int update_rate=100000;
  
-@@ -125,65 +155,100 @@
+@@ -125,65 +157,100 @@ float min (float x, float y) {
  }
  
  /*
@@ -212,7 +220,7 @@
  }
  
  /* SIGCHLD handler */
-@@ -208,6 +273,11 @@
+@@ -208,6 +275,11 @@ int main(int argc, char *argv[]) {
      
      if (*arg=='-') {
        switch (arg[1]) {
@@ -224,7 +232,7 @@
        case 'd' :
  	if (strcmp(arg+1, "display")) {
  	  usage();
-@@ -345,6 +415,7 @@
+@@ -345,6 +417,7 @@ void usage(void) {
    fprintf(stderr, "\nWmwave - Carsten Schuermann <carsten@schuermann.org>  http://www.schuermann.org/~dockapps\n\n");
    fprintf(stderr, "usage:\n");
    fprintf(stderr, "    -display <display name>\n");