svn commit: r551208 - in head/net-mgmt/portmon: . files

[Stefan Eßer]

Author: se
Date: Fri Oct  2 13:38:59 2020
New Revision: 551208
URL: https://svnweb.freebsd.org/changeset/ports/551208

Log:
  Fix build with -fno-common

Added:
  head/net-mgmt/portmon/files/patch-extras_portmon.8
     - copied, changed from r551207, head/net-mgmt/portmon/files/patch-extras__portmon.8
  head/net-mgmt/portmon/files/patch-src_portmon.c   (contents, props changed)
  head/net-mgmt/portmon/files/patch-src_portmon.h   (contents, props changed)
Deleted:
  head/net-mgmt/portmon/files/patch-extras__portmon.8
Modified:
  head/net-mgmt/portmon/Makefile

Modified: head/net-mgmt/portmon/Makefile
==============================================================================
--- head/net-mgmt/portmon/Makefile	Fri Oct  2 13:34:06 2020	(r551207)
+++ head/net-mgmt/portmon/Makefile	Fri Oct  2 13:38:59 2020	(r551208)
@@ -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
 

Copied and modified: head/net-mgmt/portmon/files/patch-extras_portmon.8 (from r551207, head/net-mgmt/portmon/files/patch-extras__portmon.8)
==============================================================================
--- head/net-mgmt/portmon/files/patch-extras__portmon.8	Fri Oct  2 13:34:06 2020	(r551207, copy source)
+++ head/net-mgmt/portmon/files/patch-extras_portmon.8	Fri Oct  2 13:38:59 2020	(r551208)
@@ -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 at aboleo.net>

Added: head/net-mgmt/portmon/files/patch-src_portmon.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/portmon/files/patch-src_portmon.c	Fri Oct  2 13:38:59 2020	(r551208)
@@ -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);

Added: head/net-mgmt/portmon/files/patch-src_portmon.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/portmon/files/patch-src_portmon.h	Fri Oct  2 13:38:59 2020	(r551208)
@@ -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
+