Import of pkgsrc-2016Q3

net/nocol/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2015/06/12 10:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2016/07/09 06:38:44 wiz Exp $
 #
 
 DISTNAME=		nocol-4.3.1
-PKGREVISION=		11
+PKGREVISION=		13
 CATEGORIES=		net
-MASTER_SITES=	http://www.netplex-tech.com/software/nocol/downloads/
+MASTER_SITES=		http://www.netplex-tech.com/software/nocol/downloads/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.netplex-tech.com/software/nocol/
@@ -37,35 +37,33 @@ INSTALL_MAKE_FLAGS+=	ROOTDIR=${DESTDIR}${PREFIX} \
 			DATADIR=${DESTDIR}/var/run/data \
 			MSGSDIR=${DESTDIR}/var/run/msgs
 
-post-patch:
-	@(hostname=`/bin/hostname`;					\
-	dir="";								\
-	for d in /usr/bin /usr/sbin `${ECHO} $$PATH | ${TR} ':' ' '`; do \
-		if [ -x $$d/host ]; then				\
-			dir=$$d;					\
-			break;						\
-		fi							\
-	done;								\
-	if [ "X$$dir" = "X" ]; then					\
-		${ECHO} "host program not found";			\
-		exit 1;							\
-	fi;								\
-	fqdn=`$$dir/host $$hostname | ${AWK} '{ print $$1; exit }'`;	\
-	${SED} -e 's|@prefix@|${PREFIX}|g' -e "s|@FQDN@|$$fqdn|g" 	\
-			${FILESDIR}/answers > ${WRKSRC}/answers)
+post-extract:
+	${CP} ${FILESDIR}/answers ${WRKSRC}/answers
+
+# XXX This is compiled in as the logging host. Compiling in "localhost"
+# lacks a certain something; however, for years it was compiling in the
+# name of the build host, or, not infrequently, something entirely
+# invalid.
+FQDN=			localhost
+
+SUBST_CLASSES+=		answers
+SUBST_STAGE.answers=	pre-configure
+SUBST_FILES.answers=	answers
+SUBST_VARS.answers=	PREFIX PKGMANDIR FQDN
 
 pre-configure:
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmpapps
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmp
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmpapps
+	${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp
+	${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmpapps
+	${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmp
+	${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmpapps
 
 post-install:
-	for f in critical.wav error.wav warning.wav ; do		\
-	    ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f ${DESTDIR}${PREFIX}/share/nocol; \
+	set -e; for f in critical.wav error.wav warning.wav ; do	\
+	    ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f			\
+			    ${DESTDIR}${PREFIX}/share/nocol;		\
 	done
 
-	for f in bluesq.gif critical.jpg empty.gif error.jpg		\
+	set -e; for f in bluesq.gif critical.jpg empty.gif error.jpg	\
 		greensq.gif help.jpg info.jpg redsq.gif warning.jpg	\
 		yellowsq.gif ; do					\
 	    ${INSTALL_DATA} ${WRKSRC}/webnocol/gifs/$$f			\

net/nocol/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2013/03/03 01:07:24 joerg Exp $
+$NetBSD: distinfo,v 1.21 2016/03/13 09:06:01 dholland Exp $
 
 SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
 RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8
+SHA512 (nocol-4.3.1.tar.gz) = 5fea1233ce3a9d132e370304e14284e92dc547c9956510a557c9342fc73a928a12b3b1b2795cb3bac4e9a8912f6a21ff4c652ec5ab4b11aa972df461d060ef03
 Size (nocol-4.3.1.tar.gz) = 1117438 bytes
-SHA1 (patch-aa) = cac346e3ae5889ebea5ab2abc895ed46935b7d97
+SHA1 (patch-aa) = 01dc14aabc183bdfaf29ddbc11f624d872a5bece
 SHA1 (patch-ab) = dc7763d83a95ead899bbe74ea68c706d093ccb6f
 SHA1 (patch-ac) = b2e16760e8d57b2c2b719e6c42dcd5846d71f179
 SHA1 (patch-ad) = a64750ad0bfa40f8c01e3d6af49b40c525f13985
@@ -11,30 +12,38 @@ SHA1 (patch-ae) = 57bfc3941aa765eda2a54da45122a5fde642ee3f
 SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158
 SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d
 SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a
-SHA1 (patch-ak) = 97364e3ca5956d43b6e18520a288242d4bfc9131
+SHA1 (patch-ak) = f619ccc5b0b56c6cf2863642478643f1f5ed2e71
 SHA1 (patch-al) = f4932b5e84fc7647140c2b3e46abd6b12ea7e887
 SHA1 (patch-am) = a8345c95b9183e1a70af682729d24ebb8af97eb6
 SHA1 (patch-an) = 1a869a8a2e4e0c5a29540bff7d1da76e4d8c74e9
 SHA1 (patch-ao) = 83a4f72fbf433ef496fee481af36dac7b9c51c4a
-SHA1 (patch-ap) = 0c7ca32c9d00eb493df3ff2b1c441e6c1e1aa34e
+SHA1 (patch-ap) = ee204a0ad164262687e9a1161d8df66ce347a3b3
 SHA1 (patch-aq) = 04a764918910d6d20e09842ff280be0231a269f5
-SHA1 (patch-ar) = 758be995183713f7d390f6642a7d66ab147cefe0
+SHA1 (patch-ar) = 1f26beb46a23d9f7b6b89e8039e6df6b343de286
 SHA1 (patch-as) = 7a49170bbeb04812ad83c294777d9d364e60823f
 SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908
 SHA1 (patch-au) = a8bbcb0eef41ac514bb1106c5feedb5bc087aac7
-SHA1 (patch-cmu-snmp_snmp_new-parse.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-cmu-snmp_snmp_asn1.c) = 555edf5310f40ef52fe38e42303c989733e8279f
 SHA1 (patch-etherload_bpf_c) = 2d11b411693b8bca39954da47bc2fc9afb1fc273
 SHA1 (patch-etherload_get__devlist_c) = dc03458a5ba5d825371dafced876de4c80228fb3
 SHA1 (patch-etherload_main_c) = 0ee5cffa70b42be6eca2e5de90b5583a7d684d50
 SHA1 (patch-etherload_nocol__specific_c) = 16c9c6ec50b56dbf4e35498eb09ee04e788f901b
 SHA1 (patch-etherload_util_c) = 964e84020af0ac2903aa7fb87512b81be67cb1fe
-SHA1 (patch-genmon_genmon_c) = cb07a91c2e9ae3f28f59578563b994bd3557018b
+SHA1 (patch-eventselect_eventselect.c) = 02f5540fd92ccd94f5233beb2770ad9c7d402f1c
+SHA1 (patch-genmon_genmon_c) = ec6842548adb3a7efb2cb9aa6b24265d183f75b5
 SHA1 (patch-lib_misc_c) = 486f954d2554907c17822525f5ba33e75a581943
-SHA1 (patch-netconsole_netconsole_c) = 08283ba29c0ff63dbc23501011a7c3e56b272d0a
+SHA1 (patch-netconsole_netconsole_c) = f6e799973fec6baf0b1c7132acfaee2cc4e60b9d
 SHA1 (patch-netconsole_read__filter_c) = 03e5a0e3a5ffad7b5260c3902dfb505d52927522
-SHA1 (patch-netconsole_utils_c) = 40bfc9bee53f6c77ccf7674bdb0ab153e56eadc3
+SHA1 (patch-netconsole_utils_c) = 45467a71bc58b58bc4ff4521bf3fe5a3c6ba13f3
 SHA1 (patch-noclog_noclogd_c) = 65409b1768de39eb8341af9aafb9d7a81c9622bb
 SHA1 (patch-nsmon_main_c) = 26992f1cc7b4cbfac3f968937ee9533b9c55d126
+SHA1 (patch-nsmon_nsmon.c) = 3bcd592d7c126b48fde587b1fff81d8df3cec1c0
+SHA1 (patch-ntpmon_main.c) = 0193578372fc1d21cb7eaf735d4631311d1c0cc6
+SHA1 (patch-ntpmon_ntpmon.c) = 012458c3ce46f94ff54bf5c613726649443fb3e0
+SHA1 (patch-pingmon_poll__sites.c) = 5a8bc4edaad239a8ed3e9c0bd6c8647bc8b490e7
+SHA1 (patch-radiusmon_main.c) = 40cc079a0940c604d603c6a52dc16fe1256deeaf
+SHA1 (patch-radiusmon_radiusmon.c) = f64a1516feb1248a23badb3cf4f030a8ab63dec4
 SHA1 (patch-strerror_c) = 566959a5784ea640c269b247cdd1ad5ad988882e
+SHA1 (patch-support_rpcping_rpcping.c) = 401994995fc0504cdfe46949f4aaa7758a350c3a
 SHA1 (patch-tknocol_ndaemon_c) = 9ea38cd4495b4b99532dcaecaf266c28662bc5c0
 SHA1 (patch-utility_display__nocol__datafile_c) = 6c7796043658fa6e56d2ccf4a0b5346007aea537

net/nocol/files/answers

@@ -1,5 +1,5 @@
-@prefix@    
-@prefix@/man/mann
+@PREFIX@    
+@PREFIX@/@PKGMANDIR@/mann
 n
 @FQDN@
 /usr/bin/mail
@@ -8,4 +8,4 @@ root@@FQDN@
 cc
 -O
 yacc
-@prefix@/bin/perl
+@PREFIX@/bin/perl

net/nocol/patches/patch-aa

@@ -1,11 +1,15 @@
-$NetBSD: patch-aa,v 1.6 2012/09/09 19:49:45 dholland Exp $
+$NetBSD: patch-aa,v 1.7 2016/03/13 09:06:01 dholland Exp $
 
-Don't use curses internals.
+- Use standard headers.
+- Don't use curses internals.
 
---- netconsole/build_display.c.orig	Thu Jul 13 11:13:37 2000
-+++ netconsole/build_display.c	Thu Jul 13 11:15:26 2000
-@@ -59,7 +59,7 @@
+--- netconsole/build_display.c.orig	1994-11-29 20:41:06.000000000 +0000
++++ netconsole/build_display.c
+@@ -57,9 +57,10 @@
+  */
+ 
  #include 	"netconsole.h"
++#include <string.h>
  
  
 -#define WFULL(w)  	(w->_cury == (w->_maxy - 1)) ? 1:0
@@ -13,7 +17,7 @@ Don't use curses internals.
  
  build_display ()
  {
-@@ -229,8 +229,8 @@
+@@ -229,8 +230,8 @@ display_screenful ()
  		"\n(DEBUG): frozen = %s, quiet = %s\n", 
  		frozen ? "YES" : "NO", quiet ? "YES" : "NO" );
  	wprintw(aw.wmsg,		
@@ -24,7 +28,7 @@ Don't use curses internals.
  	wclrtoeol(aw.wmsg);
      }
      
-@@ -238,8 +238,8 @@
+@@ -238,8 +239,8 @@ display_screenful ()
       * Am calling touchwin() since its foolproof (see discussion above)
       */
      touchwin (aw.wmain);

net/nocol/patches/patch-ak

@@ -1,10 +1,20 @@
-$NetBSD: patch-ak,v 1.2 2012/09/09 19:49:45 dholland Exp $
+$NetBSD: patch-ak,v 1.3 2016/03/13 09:06:01 dholland Exp $
 
-Don't use nonexistent/nonstandard curses interfaces.
+- Use standard headers
+- Don't use nonexistent/nonstandard curses interfaces.
 
---- netconsole/setup_display.c	2002/06/28 08:31:30	1.1
-+++ netconsole/setup_display.c	2002/06/28 08:31:50
-@@ -48,8 +48,8 @@
+--- netconsole/setup_display.c.orig	1994-11-29 20:41:10.000000000 +0000
++++ netconsole/setup_display.c
+@@ -31,6 +31,8 @@
+  *
+  *
+  */
++#include <stdlib.h>
++#include <string.h>
+ #include	"netconsole.h"
+ 
+ setup_display()
+@@ -45,8 +47,8 @@ setup_display()
      {
  	endwin ();
  	fprintf (stderr, 

net/nocol/patches/patch-ap

@@ -1,15 +1,17 @@
-$NetBSD: patch-ap,v 1.2 2012/09/09 19:35:20 dholland Exp $
+$NetBSD: patch-ap,v 1.3 2016/03/13 09:06:01 dholland Exp $
 
 - use standard headers
 - don't declare own errno
 
 --- tpmon/tpmon.c.orig	1998-07-31 18:35:34.000000000 +0000
 +++ tpmon/tpmon.c
-@@ -30,13 +30,15 @@
+@@ -30,13 +30,17 @@
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
 -#include <sys/errno.h>
++#include <string.h>
++#include <arpa/inet.h>
 +#include <errno.h>
  #include <time.h>
  #include <sys/time.h>
@@ -22,7 +24,7 @@ $NetBSD: patch-ap,v 1.2 2012/09/09 19:35:20 dholland Exp $
  #include <netdb.h>
  #ifndef NeXT
  #  include <unistd.h>
-@@ -47,7 +49,6 @@
+@@ -47,7 +51,6 @@
  #include "osdefs.h"		/* definition of RAND */
  
  extern char *prognm;

net/nocol/patches/patch-ar

@@ -1,10 +1,15 @@
-$NetBSD: patch-ar,v 1.2 2012/09/09 19:49:45 dholland Exp $
+$NetBSD: patch-ar,v 1.3 2016/03/13 09:06:01 dholland Exp $
 
-Don't declare own errno.
+- Use standard headers.
+- Don't declare own errno.
 
---- trapmon/trapmon.c.orig	2005-12-18 20:36:47.000000000 +0000
+--- trapmon/trapmon.c.orig	2000-01-27 05:16:53.000000000 +0000
 +++ trapmon/trapmon.c
-@@ -93,4 +93,2 @@ static char rcsid[] = 
+@@ -44,2 +44,3 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+@@ -93,4 +94,2 @@ static char rcsid[] = 
  
 -extern int  errno;
 -

net/nocol/patches/patch-cmu-snmp_snmp_asn1.c

@@ -0,0 +1,14 @@
+$NetBSD: patch-cmu-snmp_snmp_asn1.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- cmu-snmp/snmp/asn1.c~	1998-05-29 13:46:30.000000000 +0000
++++ cmu-snmp/snmp/asn1.c
+@@ -36,6 +36,7 @@
+ #endif /* HAVE_CONFIG_H */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #ifdef WIN32
+ #include <memory.h>

net/nocol/patches/patch-eventselect_eventselect.c

@@ -0,0 +1,12 @@
+$NetBSD: patch-eventselect_eventselect.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- eventselect/eventselect.c~	1998-09-28 20:26:18.000000000 +0000
++++ eventselect/eventselect.c
+@@ -44,4 +44,5 @@ static char rcsid[] = "$Id: eventselect.
+ #endif
+ 
++#include <stdlib.h>
+ #include "nocol.h"
+ #include <fcntl.h>		/* for O_RDONLY definition */

net/nocol/patches/patch-genmon_genmon_c

@@ -1,17 +1,19 @@
-$NetBSD: patch-genmon_genmon_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+$NetBSD: patch-genmon_genmon_c,v 1.2 2016/03/13 09:06:01 dholland Exp $
 
-Functions returning pointers must be declared before being called.
+- Use standard headers.
+- Functions returning pointers must be declared before being called.
 (The function in question does not appear to be in any header file
 and it isn't clear which if any it should be added to.)
 
---- genmon/genmon.c~	1998-07-15 16:27:49.000000000 +0000
+--- genmon/genmon.c.orig	1998-07-15 16:27:49.000000000 +0000
 +++ genmon/genmon.c
-@@ -56,6 +56,8 @@
+@@ -55,6 +55,9 @@
+ #include "nocol.h"
  #include <sys/file.h>			/* for access() defines */
  #include <string.h>
- 
-+EVENT *logstr_to_event(char *s);
++#include <stdlib.h>
 +
++EVENT *logstr_to_event(char *s);
+ 
  #ifndef SLEEPTIME
  # define SLEEPTIME  15			/* after each popen()  */
- #endif

net/nocol/patches/patch-netconsole_netconsole_c

@@ -1,14 +1,15 @@
-$NetBSD: patch-netconsole_netconsole_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+$NetBSD: patch-netconsole_netconsole_c,v 1.2 2016/03/13 09:06:01 dholland Exp $
 
 Use standard headers.
 
---- netconsole/netconsole.c~	1999-11-01 05:39:53.000000000 +0000
+--- netconsole/netconsole.c.orig	1999-11-01 05:39:53.000000000 +0000
 +++ netconsole/netconsole.c
-@@ -79,6 +79,8 @@
+@@ -79,6 +79,9 @@
   ** INCLUDES
   */
  
 +#include <stdlib.h>
++#include <string.h>
 +
  #include	"netconsole.h"			/* application specific	*/
  

net/nocol/patches/patch-netconsole_utils_c

@@ -1,13 +1,14 @@
-$NetBSD: patch-netconsole_utils_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+$NetBSD: patch-netconsole_utils_c,v 1.2 2016/03/13 09:06:01 dholland Exp $
 
 Use standard headers.
 
---- netconsole/utils.c~	2000-01-19 03:51:20.000000000 +0000
+--- netconsole/utils.c.orig	2000-01-19 03:51:20.000000000 +0000
 +++ netconsole/utils.c
-@@ -16,4 +16,6 @@
+@@ -16,4 +16,7 @@
  #endif
  
 +#include <stdlib.h>
++#include <string.h>
 +
  #include  "netconsole.h"
  

net/nocol/patches/patch-nsmon_nsmon.c

@@ -0,0 +1,14 @@
+$NetBSD: patch-nsmon_nsmon.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- nsmon/nsmon.c~	1997-03-21 05:14:43.000000000 +0000
++++ nsmon/nsmon.c
+@@ -36,6 +36,7 @@
+  *
+  */
+ 
++#include <string.h>
+ #include "nsmon.h"
+ 
+ /*

net/nocol/patches/patch-ntpmon_main.c

@@ -0,0 +1,14 @@
+$NetBSD: patch-ntpmon_main.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- ntpmon/main.c~	1998-06-30 20:26:16.000000000 +0000
++++ ntpmon/main.c
+@@ -26,6 +26,7 @@
+   */ 
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include "nocol.h"
+ #include "ntpmon.h"

net/nocol/patches/patch-ntpmon_ntpmon.c

@@ -0,0 +1,14 @@
+$NetBSD: patch-ntpmon_ntpmon.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- ntpmon/ntpmon.c~	1998-08-13 11:42:06.000000000 +0000
++++ ntpmon/ntpmon.c
+@@ -24,6 +24,7 @@
+  *
+  */
+ 
++#include <string.h>
+ #include "ntpmon.h"
+ int readconf();
+ 

net/nocol/patches/patch-pingmon_poll__sites.c

@@ -0,0 +1,14 @@
+$NetBSD: patch-pingmon_poll__sites.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- pingmon/poll_sites.c~	1998-08-31 14:44:48.000000000 +0000
++++ pingmon/poll_sites.c
+@@ -76,6 +76,7 @@
+ 
+ #include "pingmon.h"
+ 
++#include <string.h>
+ #include <signal.h>
+ #include <sys/file.h>
+ 

net/nocol/patches/patch-radiusmon_main.c

@@ -0,0 +1,16 @@
+$NetBSD: patch-radiusmon_main.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- radiusmon/main.c~	1999-11-15 06:43:48.000000000 +0000
++++ radiusmon/main.c
+@@ -32,7 +32,9 @@
+   */ 
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <fcntl.h>
++#include <arpa/inet.h>
+ 
+ #include "nocol.h"
+ #include "radiusmon.h"

net/nocol/patches/patch-radiusmon_radiusmon.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-radiusmon_radiusmon.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- radiusmon/radiusmon.c~	1999-11-05 03:37:33.000000000 +0000
++++ radiusmon/radiusmon.c
+@@ -37,6 +37,8 @@
+  *
+  */
+ 
++#include <string.h>
++#include <arpa/inet.h>
+ #include "radiusmon.h"
+ 
+ #ifdef TEST

net/nocol/patches/patch-support_rpcping_rpcping.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-support_rpcping_rpcping.c,v 1.1 2016/03/13 09:06:01 dholland Exp $
+
+Use standard headers.
+
+--- support/rpcping/rpcping.c~	1998-07-31 21:20:14.000000000 +0000
++++ support/rpcping/rpcping.c
+@@ -42,6 +42,8 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_prot.h>