From nobody Wed Feb 15 19:27:58 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PH7QQ6RXzz3rDj2; Wed, 15 Feb 2023 19:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PH7QQ61Q4z4Gkm; Wed, 15 Feb 2023 19:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676489278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f++HoRrFAVp8vH8y5M1RULQFvvaC3S7Sp3txGLYm9Dw=; b=DNdlUg0pfkIr4xEqkHfcPP+jRa8ELPijjAJhODtNkZZbIy2zscSxu1VUpcTbavC3OHeYMi Ru3C2PRiq7j1SkQ0DW7ACkmRiHRVf4jOEGxG2wCpbLBU4ZAUnJYLZ/gQgIk9jBNq/gxEMo 2r9u9gs9RnKMfgBBlwUvk0nC3UesdubU4YdDyAfLLsJhLbbyFq5btZ4HLsVYKGgB+A/6du GzWmuxpy3MSLVxeSe3VsadK0NfTeDBl2H3Ubfkd4YvLd3zNkaaCvqQnIIuTEqMcrvYWlxc 0yuDpPdvI7Bxxi9lQ+NFN8QiJXwqo7eYs0bkmV+6woNMnOFEQ3G5ti7U7lS8Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676489278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f++HoRrFAVp8vH8y5M1RULQFvvaC3S7Sp3txGLYm9Dw=; b=PS354x55i9xsyvmsgLYTDv29bGmcsHm7DuhT4G1xzDOdZ9HS9Li5UAwdQ4lTwJvhE2tGQ/ mUivbdG3qXVw7tTVVvdpgY7eYAdFRsXOUXwpL09OzQKWzp9WxPw5iKlzCFqtORN5v+j6wx M+waCvzNknP4w4FY0bo6eFLQQrJEmEZWWNG1lXvLbDeiiQ0J6WP/1+6ahX6NTfyNi6oJae dCXKNy3qOyNj8331MiuKuFk1GAbesOKd1L2IIJTBMqQ2jYYAbHMr7VJByuZWcYOdP/7fZw 5a6zCi3D0/RkJaOmiyqtPf8JcUqkPfSDsAyVCree8wAxZ+wYKHMtXuxWPAfaLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676489278; a=rsa-sha256; cv=none; b=GG1mKwuWqe7Ywvd8VuwvpZRaQUBFdCA66JNi3QXpyuR9W8JeVYNpLXNlyXbgUci55UDWi4 2thRrPnnE0okSQ8WOiMgnj0nzUtVpYcp6LaMXRs51JV+6gFc4fyc8KfKctBwXI0kDHIN6d Z8G+ypX6M1kVNefcTw3xd8Uk2YTZfpbxr5zFJ43+nmxgOehMAPx0pFgCs5+MV9UhvGbWll qBJcnZ6DKp2GPExqoQZUqlLNLqKUbKkdOjHKmbRO/bmeyK7xZHvhCWvMC4R80GLbNxANhX YHNtLw/zCXrUQpK6eft0kwYSaXCfHcgvIKkXGK74iNb4glz7EG2xl9sx9QY0KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PH7QQ53LRzZsn; Wed, 15 Feb 2023 19:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31FJRwmF033676; Wed, 15 Feb 2023 19:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31FJRwpD033675; Wed, 15 Feb 2023 19:27:58 GMT (envelope-from git) Date: Wed, 15 Feb 2023 19:27:58 GMT Message-Id: <202302151927.31FJRwpD033675@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: f2e79d379443 - 2023Q1 - net/wmwave: fix build with -fno-common List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: f2e79d379443412ef854ddf0b210124a431854ff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2e79d379443412ef854ddf0b210124a431854ff commit f2e79d379443412ef854ddf0b210124a431854ff Author: Robert Clausecker AuthorDate: 2023-02-09 13:44:12 +0000 Commit: Robert Clausecker CommitDate: 2023-02-15 19:27:10 +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 (cherry picked from commit 3ed49e6414ed7ec56e9a2d4683ea3114271bcae3) --- 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 + #include + #include ++#include + + #include + #include +@@ -57,6 +70,23 @@ #include #include @@ -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 http://www.schuermann.org/~dockapps\n\n"); fprintf(stderr, "usage:\n"); fprintf(stderr, " -display \n");