Fix build with -fno-common

This commit is contained in:
Stefan Eßer 2020-10-02 13:38:59 +00:00
parent 122674f6ff
commit 707f559724
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=551208
4 changed files with 64 additions and 5 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= portmon
PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://voodoo.bawue.com/download/ \
http://www.aboleo.net/software/portmon/downloads/ \
@ -16,12 +17,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
PLIST_FILES= bin/portmon etc/portmon.hosts.sample share/man/man8/portmon.8.gz
PORTDOCS= README
PLIST_FILES= bin/portmon etc/portmon.hosts.sample man/man8/portmon.8.gz
OPTIONS_DEFINE= DOCS
post-patch:
post-build:
@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' \
${WRKSRC}/extras/${PORTNAME}.8
@ -29,7 +30,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/extras/portmon.8 \
${STAGEDIR}${PREFIX}/man/man8
${STAGEDIR}${MAN8PREFIX}/share/man/man8
${INSTALL_DATA} ${WRKSRC}/extras/portmon.hosts.sample \
${STAGEDIR}${PREFIX}/etc

View File

@ -1,5 +1,5 @@
--- extras/portmon.8.orig Sun Aug 24 10:08:43 2003
+++ extras/portmon.8 Sun Aug 24 10:09:06 2003
--- extras/portmon.8.orig 2003-08-24 07:11:14 UTC
+++ extras/portmon.8
@@ -1,6 +1,6 @@
.\" manpage for portmon
.\" by Nik Reiman, <nik@aboleo.net>

View File

@ -0,0 +1,21 @@
--- src/portmon.c.orig 2003-08-23 06:01:10 UTC
+++ src/portmon.c
@@ -35,6 +35,18 @@
#include <getopt.h>
#endif
+int report_flag;
+int daemonize_flag;
+
+struct host_struct *hosts;
+
+char *err_msg;
+char logfile[STRLARGE];
+int timeout;
+int verbose;
+
+
+
void version(void)
{
printf("This is %s, version %s\n", PACKAGE, VERSION);

View File

@ -0,0 +1,37 @@
--- src/portmon.h.orig 2003-08-23 06:04:38 UTC
+++ src/portmon.h
@@ -31,8 +31,8 @@
#define STRLARGE 512
// flags
-int report_flag;
-int daemonize_flag;
+extern int report_flag;
+extern int daemonize_flag;
struct port
{
@@ -48,17 +48,17 @@ struct host_struct
char name[STRMED];
struct port ports[STRSMALL];
int num_ports;
-}
- *hosts;
+};
+extern struct host_struct *hosts;
// place to hold error messages
-char *err_msg;
+extern char *err_msg;
// place we log crap
-char logfile[STRLARGE];
+extern char logfile[STRLARGE];
// timeout (seconds)
-int timeout;
+extern int timeout;
// verbose mode
-int verbose;
+extern int verbose;
// Functions in various files