git: ba66f057083d - main - textproc/refdb: fix build with -fno-common
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Apr 2023 21:55:51 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba66f057083d607aa00cbd03bd68e33b90f95a3e commit ba66f057083d607aa00cbd03bd68e33b90f95a3e Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-04-17 14:52:52 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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);