Attachment #237889 for bug #267588

View | Details | Raw Unified | Return to bug 267588
Collapse All | Expand All




PORTNAME=	wmwave
DISTVERSION=	0-4
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=		https://sourceforge.net/projects/wmwave/

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		localbase:ldflags xorg
USE_XORG=	x11 xext xpm

PLIST_FILES=	bin/wmwave man/man1/wmwave.1.gz
WRKSRC=		${WRKDIR}/${PORTNAME}
CFLAGS+=	-DWICACHE
LDFLAGS+=	-lX11 -lXpm -lXext -lm

do-build:
	${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/wmgeneral.c \




--- 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;

Added Link Here

(-)b/net/wmwave/files/patch-wmgeneral.h (+11 lines)
1	--- wmgeneral.h.orig 2022-11-06 10:29:16 UTC
2	+++ wmgeneral.h
3	@@ -36,7 +36,7 @@ typedef struct {
4	/* Global variable */
5	/*******************/
6
7	-Display *display;
8	+extern Display *display;
9
10	/***********************/
11	/* Function Prototypes */

Lines 1-5 Link Here

(-)b/net/wmwave/files/patch-wmwave.c (-8 / +15 lines)
1	--- wmwave.c.orig 2008-02-27 09:24:06.628732284 +1030	1	--- wmwave.c.orig 1999-08-20 13:44:21 UTC
2	+++ wmwave.c 2008-02-27 09:32:07.088117765 +1030	2	+++ wmwave.c
3	@@ -29,6 +29,18 @@	3	@@ -29,6 +29,18 @@
4	*	4	*
5	* Revision 1.1 1999/08/15 15:39:18 carsten	5	* Revision 1.1 1999/08/15 15:39:18 carsten
Lines 19-25 Link Here
19	*	19	*
20	*/	20	*/
21		21
22	@@ -57,6 +69,23 @@	22	@@ -45,6 +57,7 @@
		23	#include <limits.h>
		24	#include <errno.h>
		25	#include <signal.h>
		26	+#include <err.h>
		27
		28	#include <sys/wait.h>
		29	#include <sys/stat.h>
		30	@@ -57,6 +70,23 @@
23	#include <X11/xpm.h>	31	#include <X11/xpm.h>
24	#include <X11/extensions/shape.h>	32	#include <X11/extensions/shape.h>
25		33
Lines 43-49 Link Here
43		51
44	#include "wmgeneral.h"	52	#include "wmgeneral.h"
45		53
46	@@ -66,7 +94,9 @@	54	@@ -66,7 +96,9 @@ char wmwave_mask_bits[64*64];
47	int wmwave_mask_width = 64;	55	int wmwave_mask_width = 64;
48	int wmwave_mask_height = 64;	56	int wmwave_mask_height = 64;
49		57
Lines 54-60 Link Here
54		62
55	int update_rate=100000;	63	int update_rate=100000;
56		64
57	@@ -125,65 +155,100 @@	65	@@ -125,65 +157,100 @@ float min (float x, float y) {
58	}	66	}
59		67
60	/*	68	/*
Lines 212-218 Link Here
212	}	220	}
213		221
214	/* SIGCHLD handler */	222	/* SIGCHLD handler */
215	@@ -208,6 +273,11 @@	223	@@ -208,6 +275,11 @@ int main(int argc, char *argv[]) {
216		224
217	if (*arg=='-') {	225	if (*arg=='-') {
218	switch (arg[1]) {	226	switch (arg[1]) {
Lines 224-230 Link Here
224	case 'd' :	232	case 'd' :
225	if (strcmp(arg+1, "display")) {	233	if (strcmp(arg+1, "display")) {
226	usage();	234	usage();
227	@@ -345,6 +415,7 @@	235	@@ -345,6 +417,7 @@ void usage(void) {
228	fprintf(stderr, "\nWmwave - Carsten Schuermann <carsten@schuermann.org> http://www.schuermann.org/~dockapps\n\n");	236	fprintf(stderr, "\nWmwave - Carsten Schuermann <carsten@schuermann.org> http://www.schuermann.org/~dockapps\n\n");
229	fprintf(stderr, "usage:\n");	237	fprintf(stderr, "usage:\n");
230	fprintf(stderr, " -display <display name>\n");	238	fprintf(stderr, " -display <display name>\n");
231	-

Return to bug 267588

Lines 1-24 Link Here

(-)b/net/wmwave/Makefile (-8 / +8 lines)
1	PORTNAME= wmwave	1	PORTNAME= wmwave
2	DISTVERSION= 0-4	2	DISTVERSION= 0-4
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= net	4	CATEGORIES= net
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
6	EXTRACT_SUFX= .tgz	6	EXTRACT_SUFX= .tgz
7		7
8	MAINTAINER= benjsc@FreeBSD.org	8	MAINTAINER= benjsc@FreeBSD.org
9	COMMENT= Display 802.11 status in the WindowMaker Dock	9	COMMENT= Display 802.11 status in the WindowMaker Dock
10	WWW= http://www.schuermann.org/~dockapps/	10	WWW= https://sourceforge.net/projects/wmwave/
11		11
12	BROKEN_FreeBSD_13= ld: error: duplicate symbol: display	12	LICENSE= GPLv2
13	BROKEN_FreeBSD_14= ld: error: duplicate symbol: display	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	USES= xorg	15	USES= localbase:ldflags xorg
16	USE_XORG= xpm	16	USE_XORG= x11 xext xpm
17		17
18	PLIST_FILES= bin/wmwave man/man1/wmwave.1.gz	18	PLIST_FILES= bin/wmwave man/man1/wmwave.1.gz
19	WRKSRC= ${WRKDIR}/${PORTNAME}	19	WRKSRC= ${WRKDIR}/${PORTNAME}
20	CFLAGS+= -DWICACHE -I${PREFIX}/include	20	CFLAGS+= -DWICACHE
21	LDFLAGS+= -L${PREFIX}/lib -lX11 -lXpm -lXext -lm	21	LDFLAGS+= -lX11 -lXpm -lXext -lm
22		22
23	do-build:	23	do-build:
24	${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/wmgeneral.c \	24	${CC} ${CFLAGS} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/wmgeneral.c \

Added Link Here

(-)b/net/wmwave/files/patch-wmgeneral.c (+13 lines)
1	--- wmgeneral.c.orig 2022-11-06 10:29:50 UTC
2	+++ wmgeneral.c
3	@@ -65,8 +65,9 @@
4	/* X11 Variables */
5	/*****************/
6
7	+Display *display;
8	Window Root;
9	-int screen;
10	+extern int screen;
11	int x_fd;
12	int d_depth;
13	XSizeHints mysizehints;