svn commit: r545588 - in head/textproc/xlhtml: . files

[Fernando Apesteguía]

Author: fernape
Date: Fri Aug 21 10:49:35 2020
New Revision: 545588
URL: https://svnweb.freebsd.org/changeset/ports/545588

Log:
  textproc/xlhtml: Fix build with '-fno-common'
  
  Fix build with '-fno-common', default of GCC 10 and Clang 11
  
  While here, pet linters.
  
  PR:	248774
  Submitted by:	yasu at utahime.org

Added:
  head/textproc/xlhtml/files/patch-xlhtml_ascii.c   (contents, props changed)
  head/textproc/xlhtml/files/patch-xlhtml_html.c   (contents, props changed)
  head/textproc/xlhtml/files/patch-xlhtml_xml.c   (contents, props changed)
Modified:
  head/textproc/xlhtml/Makefile

Modified: head/textproc/xlhtml/Makefile
==============================================================================
--- head/textproc/xlhtml/Makefile	Fri Aug 21 10:45:12 2020	(r545587)
+++ head/textproc/xlhtml/Makefile	Fri Aug 21 10:49:35 2020	(r545588)
@@ -14,11 +14,16 @@ COMMENT=	Convert Excel and PowerPoint files to HTML an
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
 USES=		autoreconf gmake tar:tgz
 
+GNU_CONFIGURE=	yes
+
 OPTIONS_DEFINE=	DOCS
 
+post-build:
+	@${STRIP_CMD} ${WRKSRC}/xlhtml/xlhtml
+	@${STRIP_CMD} ${WRKSRC}/ppthtml/ppthtml
+
 post-install-DOCS-on:
 .for dir in xlhtml ppthtml
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${dir}
@@ -26,9 +31,5 @@ post-install-DOCS-on:
 		${INSTALL_DATA} ChangeLog README THANKS \
 		${STAGEDIR}${DOCSDIR}/${dir}
 .endfor
-
-post-build:
-	@${STRIP_CMD} ${WRKSRC}/xlhtml/xlhtml
-	@${STRIP_CMD} ${WRKSRC}/ppthtml/ppthtml
 
 .include <bsd.port.mk>

Added: head/textproc/xlhtml/files/patch-xlhtml_ascii.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xlhtml/files/patch-xlhtml_ascii.c	Fri Aug 21 10:49:35 2020	(r545588)
@@ -0,0 +1,15 @@
+--- xlhtml/ascii.c.orig	2002-04-11 03:25:17 UTC
++++ xlhtml/ascii.c
+@@ -48,9 +48,9 @@ extern void output_cell( cell *, int); 
+ extern uni_string author;
+ extern int null_string(U8 *);
+ extern int Csv;
+-work_sheet **ws_array;
+-font_attr **font_array;
+-xf_attr **xf_array;
++extern work_sheet **ws_array;
++extern font_attr **font_array;
++extern xf_attr **xf_array;
+ 
+ extern int IsCellNumeric(cell *);
+ extern int IsCellSafe(cell *);

Added: head/textproc/xlhtml/files/patch-xlhtml_html.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xlhtml/files/patch-xlhtml_html.c	Fri Aug 21 10:49:35 2020	(r545588)
@@ -0,0 +1,13 @@
+--- xlhtml/html.c.orig	2002-04-11 04:01:05 UTC
++++ xlhtml/html.c
+@@ -47,8 +47,8 @@ extern void output_cell( cell *, int); 
+ extern uni_string author;
+ extern int null_string(U8 *);
+ extern unsigned int next_font; 
+-work_sheet **ws_array;
+-font_attr **font_array;
++extern work_sheet **ws_array;
++extern font_attr **font_array;
+ 
+ void output_header(void);
+ void output_footer(void);

Added: head/textproc/xlhtml/files/patch-xlhtml_xml.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/xlhtml/files/patch-xlhtml_xml.c	Fri Aug 21 10:49:35 2020	(r545588)
@@ -0,0 +1,11 @@
+--- xlhtml/xml.c.orig	2002-04-11 03:25:17 UTC
++++ xlhtml/xml.c
+@@ -33,7 +33,7 @@ extern void update_default_alignment(unsigned int, int
+ extern void output_cell( cell *, int); 
+ extern uni_string author;
+ 
+-work_sheet **ws_array;
++extern work_sheet **ws_array;
+ 
+ 
+ void OutputTableXML(void)