From nobody Tue Apr 18 21:55:51 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 4Q1HmS5DSfz45klj; Tue, 18 Apr 2023 21:55:52 +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 4Q1HmS15hlz4JcM; Tue, 18 Apr 2023 21:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854952; 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=y5r8J985RnkhnxX9abTeAqOMGvjAdW8tGtRcs8ysx7g=; b=fS2m36G1Q7erh96VkndxKLugIZE0SA1zcnq/fzpPTirkCeuTJi4dd4pK7pDmZQAD5zx0PC TCJchAHSzeRPFm86xY7ZSwlj+Zh+dkTqwvPjmJmd+CMw3UmsA5FHokwGAXhjWu+Zg+n7iY 31QwxTK4D0fXvzzSeoFi7oy0C3OfpFhIiH42CSfHfi2Dnv3TvIHb6FgutRAE5wdcqHPP8Q hnBki3gPCXnldXUaw7MmCynP/TG1hnghAWQa/rK5zDQhafvSRlRR0eTqH+FAPjU9Q2zqbt 9TaC10qxtBcnXleaCnTjM55rlUYg9hiSCmcw0XCm4svFvsT+jMjm3JGXPmz9iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854952; 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=y5r8J985RnkhnxX9abTeAqOMGvjAdW8tGtRcs8ysx7g=; b=bEiYBlzuWd/Oy84hfwDkodtNBjgKpZI8QdqGOhHTGWl0CTasj6/DM8rsKH2i5cQCxQLxVW GWfb19ujINbfr0CtkAjYqmxkEg7LVXC19zOzNU9+p1bcoJBkSEYFp1Bv03Wqq6A9vbrOC7 41Xq3qeuAI9sZ4nSzXBUp3oQJ21RNCd7eldj4TIgw1Xw1fO/qDLqS41yhZennoe+Yz4syU ce6nKRHXfeOelbwTDzCy1kBSzinz1r+Hv3jFt1hvNvqdxpBI6iXm+XtkoSskPH1KaUdj6h RZg1coqhW1wDLSmzbvTwmp217e6dxcZasgRpXiS4PoI0lTzk8yhGdm4lmW4XPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681854952; a=rsa-sha256; cv=none; b=nxnxEPVJoRAvlRLI9o4ye9swN7jnm8Yn5XNX9tdc6sjnknZ9TUr34qY2b8j8KgcIYuJyDf ylZpVX0a0WSTJhLd1+ps2TyAwz9rleHzOPka/Zj/ydAvg8mPVk3QZtVSi91rH25gzr9jlO cUWI9phUO8034CcQW5PqnPMKcyaIKMjUWduFsHxgHwrS8pJe5Qh5trukTPAUS+aqnAFzfF 3ZMm4B4xvll/1quov+dgZLZ6cxhFue9WLeAtf4GsY2KzALFrZgLiITEG3ZRSHX2rd6nsRH qOGMqwzm9Pv876iJNjAUvP62twmjSyUZFTOIASzEqDHsqHPHdni1ohXPVHEreA== 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 4Q1HmR5y34zTrr; Tue, 18 Apr 2023 21:55:51 +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 33ILtpRa062645; Tue, 18 Apr 2023 21:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILtpxC062644; Tue, 18 Apr 2023 21:55:51 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:55:51 GMT Message-Id: <202304182155.33ILtpxC062644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: ba66f057083d - main - textproc/refdb: 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/main X-Git-Reftype: branch X-Git-Commit: ba66f057083d607aa00cbd03bd68e33b90f95a3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba66f057083d607aa00cbd03bd68e33b90f95a3e commit ba66f057083d607aa00cbd03bd68e33b90f95a3e Author: Robert Clausecker AuthorDate: 2023-04-17 14:52:52 +0000 Commit: Robert Clausecker CommitDate: 2023-04-18 21:55:28 +0000 textproc/refdb: fix build with -fno-common Move a variable definition from header file to source file. This fixes the build on FreeBSD 13+. Add a missing LIB_DEPENDS entry. --- textproc/refdb/Makefile | 9 +++++---- textproc/refdb/files/patch-src_readln.c | 10 ++++++++++ textproc/refdb/files/patch-src_readln.h | 11 +++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile index f212a11a9e06..c0d41d0165ea 100644 --- a/textproc/refdb/Makefile +++ b/textproc/refdb/Makefile @@ -1,7 +1,7 @@ PORTNAME= refdb PORTVERSION= 0.9.9 DISTVERSIONSUFFIX= -1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1 @@ -9,12 +9,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Bibliographic reference database WWW= http://refdb.sourceforge.net/ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: thecommandlist -BROKEN_FreeBSD_14= ld: error: duplicate symbol: thecommandlist +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ libbtparse.so:textproc/btparse \ - libdbi.so:databases/libdbi + libdbi.so:databases/libdbi \ + libltdl.so:devel/libltdl USES= gmake iconv readline perl5 libtool pkgconfig pathfix shebangfix HAS_CONFIGURE= yes diff --git a/textproc/refdb/files/patch-src_readln.c b/textproc/refdb/files/patch-src_readln.c new file mode 100644 index 000000000000..504e48c0efe8 --- /dev/null +++ b/textproc/refdb/files/patch-src_readln.c @@ -0,0 +1,10 @@ +--- src/readln.c.orig 2023-04-17 14:45:25 UTC ++++ src/readln.c +@@ -27,6 +27,7 @@ + #include "strfncs.h" + + extern COMMAND commands[]; ++COMMAND *thecommandlist; + + /* Execute a command line. */ + int execute_line (char *line, COMMAND *commandlist) diff --git a/textproc/refdb/files/patch-src_readln.h b/textproc/refdb/files/patch-src_readln.h new file mode 100644 index 000000000000..83459176434b --- /dev/null +++ b/textproc/refdb/files/patch-src_readln.h @@ -0,0 +1,11 @@ +--- src/readln.h.orig 2023-04-17 14:45:07 UTC ++++ src/readln.h +@@ -29,7 +29,7 @@ typedef struct { + char *doc; /* Documentation for this function. */ + } COMMAND; + +-COMMAND *thecommandlist; ++extern COMMAND *thecommandlist; + + COMMAND *find_command(char *name, COMMAND *commands); + int execute_line (char *line, COMMAND *commands);