From nobody Mon Nov 07 08:02:41 2022 X-Original-To: dev-commits-ports-main@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 4N5Nxs3sTGz4hJb4; Mon, 7 Nov 2022 08:02:41 +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 4N5Nxs3LxKz3nDp; Mon, 7 Nov 2022 08:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667808161; 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=N7cn6qI6K6xjJpi1EoUv9QVnmOJv1VXO0KLgFxcdmKw=; b=Zxo3KCm1MbresSnP7oQ/LciU2q6LEoUPT3PDAkiA76ESJQ1PdoVhJqo3gaoEcMjFuoaKsW rXE3McjCleU7oL8kH8whx6X+U6mGSYCvTArkvJPrDMgI4lPhe78sEW8BzZ6huO8rH2maBO 2+4evqVAupEqxTXctoVyQTDR2XgZGxiEEgc9FWJDS9xVvnmoSEWWqCXVSSDurL1FzVIse2 n3h8Ib7maQCfDlva/ZngN3ViSvlCRC65lZbgifjHZFgO8S+w2IFG2fGvWHSkCOVNddBc4U SXdh0AYN+rhtZUvfnCeRRT+/Ji3SY4IRDOYsLvjEwbip6lgZOeuauKI6176QRQ== 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 4N5Nxs2Pf1ztYl; Mon, 7 Nov 2022 08:02:41 +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 2A782faX009591; Mon, 7 Nov 2022 08:02:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A782fNk009590; Mon, 7 Nov 2022 08:02:41 GMT (envelope-from git) Date: Mon, 7 Nov 2022 08:02:41 GMT Message-Id: <202211070802.2A782fNk009590@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 14df860062a2 - main - net/wmping: fix the port's build against -fno-common List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14df860062a2417c117980666da0fd1985baaa63 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667808161; 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=N7cn6qI6K6xjJpi1EoUv9QVnmOJv1VXO0KLgFxcdmKw=; b=Qmr1XDVNY9yd7s+bACbt21zMzG7mSml5ykNTy7ccf1UWOuvT7soZqAf9ms/eSoji4ygnRP 3KfQfN6uzrvxaxtAN/cvzbnDlxCMXa7aJqlkPTa7hJVT2CUbvalSJir/r/niUyi3UbQRgp K8vJAbV/kjJjqkBPaVFCMRESB7FTXruNctgND4eHTR3b0EKA7xu4v/S1QsigsXjxSE4ajS 1fNUr7HWOm6nFftnE6EX+h1b27S458c1yQXmd2+7J9qpGbkWIwYzpY4AbMn3sYL19kAkYi PJy/4cLyjvRdGxClYRwFUfk+V4yeuVldM0mzDkctCwGw+62ps++Ic5HxWPVdrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667808161; a=rsa-sha256; cv=none; b=hee540PxnLvY6SchJfU/B46oAktujvqfRMJfhksFlocl17XsSDm9TkVQ6mkT5wxmc1RLNW jc6W3zloT2ITmiFBh2Bva6TWCx1FgXWFiH5PxzLcj4f6jqPAckCWCmzfsBU6UYmt86P0bt 59B4mzliUiu9KhM3skYvvxh+0pppTxDneme72cMjOMmtcDMYM7M2aDS82L/swT2IPCTQJY GLl54krrcdfjH1/2MfA1xJVeJwcr60+oAX8PExJ98X5jbzR0hK1sY48WRV0uWvC0bpRnGU dWR/zf9ZcFd0GwNBRJUeu3CHluPHSjLrkSMtwJEzweuCpeMzndKGCWQ60wwuQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=14df860062a2417c117980666da0fd1985baaa63 commit 14df860062a2417c117980666da0fd1985baaa63 Author: Robert Clausecker AuthorDate: 2022-11-07 08:01:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-11-07 08:01:32 +0000 net/wmping: fix the port's build against -fno-common Ensure that there is only one variable definition per each object, as the C (and C++) standards mandated for years and compilers started to enforce as of recently (Clang 11, GCC 10). While here, define LICENSE, add missing USE_XORG components, and fix -Wformat-security warnings, adding newline to printed error messages for clarity and better look. PR: 267587 --- net/wmping/Makefile | 8 ++++---- net/wmping/files/patch-wmgeneral.c | 10 ++++++++++ net/wmping/files/patch-wmgeneral.h | 11 +++++++++++ net/wmping/files/patch-wmping.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/net/wmping/Makefile b/net/wmping/Makefile index e6f7b204c582..21f331fde46b 100644 --- a/net/wmping/Makefile +++ b/net/wmping/Makefile @@ -1,6 +1,6 @@ PORTNAME= wmping PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net windowmaker MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -8,11 +8,11 @@ MAINTAINER= serg@cad.kiev.ua COMMENT= Windowmaker dock app to display network hosts status WWW= https://sourceforge.net/projects/wmping/ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: display -BROKEN_FreeBSD_14= ld: error: duplicate symbol: display +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake xorg -USE_XORG= xpm +USE_XORG= x11 xext xpm GNU_CONFIGURE= yes PORTDOCS= BUGS CHANGES README TODO diff --git a/net/wmping/files/patch-wmgeneral.c b/net/wmping/files/patch-wmgeneral.c new file mode 100644 index 000000000000..a3478c273360 --- /dev/null +++ b/net/wmping/files/patch-wmgeneral.c @@ -0,0 +1,10 @@ +--- wmgeneral.c.orig 2003-12-02 16:45:19 UTC ++++ wmgeneral.c +@@ -55,6 +55,7 @@ + /* X11 Variables */ + /*****************/ + ++Display *display; + Window Root; + int screen; + int x_fd; diff --git a/net/wmping/files/patch-wmgeneral.h b/net/wmping/files/patch-wmgeneral.h new file mode 100644 index 000000000000..8ef6d6410e1b --- /dev/null +++ b/net/wmping/files/patch-wmgeneral.h @@ -0,0 +1,11 @@ +--- wmgeneral.h.orig 2003-12-02 16:45:19 UTC ++++ wmgeneral.h +@@ -36,7 +36,7 @@ typedef struct { + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ diff --git a/net/wmping/files/patch-wmping.c b/net/wmping/files/patch-wmping.c new file mode 100644 index 000000000000..88b21ef84dd5 --- /dev/null +++ b/net/wmping/files/patch-wmping.c @@ -0,0 +1,38 @@ +--- wmping.c.orig 2004-02-09 09:27:38 UTC ++++ wmping.c +@@ -237,7 +237,7 @@ void readconf() + if(strcmp(tokens[1],"=")) + { + sprintf(str_err, "Not correct format of configuration file ( %s ): line %u", cfgfile, lineN); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s\n", str_err); + exit(-1); + } + +@@ -288,7 +288,7 @@ void readconf() + else + { + sprintf(str_err, "Not correct format of configuration file ( %s ): line %u", cfgfile, lineN); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s\n", str_err); + exit(-1); + + } +@@ -297,7 +297,7 @@ void readconf() + else + { + sprintf(str_err, "Error open configuration file ( %s ): %s", cfgfile, strerror(errno)); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s\n", str_err); + fprintf(stderr, "\n Create default configuration file\n"); + createDefaultCfg(cfgfile); + } +@@ -305,7 +305,7 @@ void readconf() + else + { + sprintf(str_err, "Error open configuration file ( %s ): %s", cfgfile, strerror(errno)); +- fprintf(stderr, str_err); ++ fprintf(stderr, "%s\n", str_err); + fprintf(stderr, "\n Create default configuration file\n"); + createDefaultCfg(cfgfile); + }