utmpx.h is no longer included by util.h, adjust. Fix inline use.

7 files changed, 143 insertions, 14 deletions

diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index cddf081504f..bc33de055ff 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2013/01/29 16:56:39 is Exp $
+$NetBSD: distinfo,v 1.38 2013/03/28 21:17:56 joerg Exp $
 
 SHA1 (mgetty1.1.37-Jun05.tar.gz) = fec9672e8be29a41f1392c6bf90c0d5732cdb2c2
 RMD160 (mgetty1.1.37-Jun05.tar.gz) = 56aa9e213e4bd79c13ace2b7222253d91e756865
@@ -13,10 +13,14 @@ SHA1 (patch-ah) = 0a3e5b1375eb36610e6a97113a8e535bf2fd1c6b
 SHA1 (patch-ai) = 0c3a6e5d067ff360789264f8be89710907f54403
 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
-SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
-SHA1 (patch-am) = 682ed20b5dae0aadfae477741ccba10bc98266d8
+SHA1 (patch-al) = 56c9e0ab12ece94e9f17a5770f30b3e46e074361
+SHA1 (patch-am) = 48ae0378747bd0550b789772541869df950fd465
 SHA1 (patch-ap) = 4b101e76df0081cc62c6fcfb424300019c09819b
 SHA1 (patch-aq) = 160e94001568a0a4025a0d26140f972ec0ed8648
 SHA1 (patch-ar) = 313f76a5d989c4511935d6fdc2ea2aadcbed76a0
 SHA1 (patch-as) = 85bcf39cf5323625bb71f1659413e87864c824cf
 SHA1 (patch-fax_Makefile) = 4d4043d84dafe5993d546518b698b10af48f126a
+SHA1 (patch-faxrec.c) = 8ce3b830140a77ad5880e455b442588fea8c3a2c
+SHA1 (patch-g3_g3cat.c) = 139e200b12ba8a1a1e946ec6fae8ccda3dbb3a26
+SHA1 (patch-g3_pbm2g3.c) = c4346b470b3aa492e236f06350859c2854d40b3f
+SHA1 (patch-login.c) = 17aa1b49b0e162cdc76d7cf53003578e2ddb1ca6
diff --git a/comms/mgetty+sendfax/patches/patch-al b/comms/mgetty+sendfax/patches/patch-al
index 952e385cd59..bdac9ff6ee8 100644
--- a/comms/mgetty+sendfax/patches/patch-al
+++ b/comms/mgetty+sendfax/patches/patch-al
@@ -1,17 +1,21 @@
-$NetBSD: patch-al,v 1.3 2003/02/27 21:43:36 fredb Exp $
+$NetBSD: patch-al,v 1.4 2013/03/28 21:17:57 joerg Exp $
 
---- utmp.c.orig	2001-12-17 16:43:25.000000000 -0600
+--- utmp.c.orig	2001-12-17 22:43:25.000000000 +0000
 +++ utmp.c
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,11 @@
  
  #include "mgetty.h"
  
 -#if defined(sunos4) || defined(BSD)
++#ifdef __NetBSD__
++#include <utmpx.h>
++#endif
++
 +#if defined(sunos4) || ( defined(BSD) && !defined(NETBSD_UTMPX) )
  
  #include <stdio.h>
  #include <string.h>
-@@ -20,10 +20,11 @@
+@@ -20,10 +24,11 @@
  #include <time.h>
  #include <string.h>
  #include <sys/types.h>
@@ -27,7 +31,7 @@ $NetBSD: patch-al,v 1.3 2003/02/27 21:43:36 fredb Exp $
  #endif
  
  #if defined(_3B1_) || defined(MEIBE) || defined(ISC)
-@@ -42,8 +43,14 @@
+@@ -42,8 +47,14 @@ typedef short pid_t;
  # endif
  #endif
  
@@ -43,7 +47,7 @@ $NetBSD: patch-al,v 1.3 2003/02/27 21:43:36 fredb Exp $
  /* on SunOS (and other BSD-derived systems), the getty process does *
   * not have to care for the utmp entries, login and init do all the work
   * Anyway, we have to _read_ it to get the number of users logged in.
-@@ -109,26 +116,74 @@
+@@ -109,26 +120,74 @@ void make_utmp_wtmp _P4( (line, ut_type,
  {
  struct utmp *utmp;
  pid_t	pid;
@@ -123,7 +127,7 @@ $NetBSD: patch-al,v 1.3 2003/02/27 21:43:36 fredb Exp $
  	    if (ut_host != NULL)
  	    {
  	    	strncpy( utmp->ut_host, ut_host, sizeof( utmp->ut_host ) - 1);
-@@ -138,7 +193,7 @@
+@@ -138,7 +197,7 @@ FILE *	fp;
  	    }
  #endif		/* SVR4 */
  
@@ -132,7 +136,7 @@ $NetBSD: patch-al,v 1.3 2003/02/27 21:43:36 fredb Exp $
  	    if ( pututline(utmp) == NULL )
  	    {
  		lprintf( L_ERROR, "cannot create utmp entry" );
-@@ -151,7 +206,7 @@
+@@ -151,7 +210,7 @@ FILE *	fp;
  	    /* write same record to end of wtmp
  	     * if wtmp file exists
  	     */
diff --git a/comms/mgetty+sendfax/patches/patch-am b/comms/mgetty+sendfax/patches/patch-am
index c7533cdc151..3c8851e4943 100644
--- a/comms/mgetty+sendfax/patches/patch-am
+++ b/comms/mgetty+sendfax/patches/patch-am
@@ -1,8 +1,19 @@
-$NetBSD: patch-am,v 1.2 2005/03/07 11:29:28 wiz Exp $
+$NetBSD: patch-am,v 1.3 2013/03/28 21:17:57 joerg Exp $
 
---- mgetty.c.orig	2003-11-17 20:09:41.000000000 +0100
+--- mgetty.c.orig	2009-03-19 15:14:28.000000000 +0000
 +++ mgetty.c
-@@ -518,7 +518,8 @@ int main _P2((argc, argv), int argc, cha
+@@ -38,6 +38,10 @@
+ #include "config.h"
+ #include "conf_mg.h"
+ 
++#ifdef __NetBSD__
++#include <utmpx.h>
++#endif
++
+ #ifdef VOICE
+ #include "voice/include/voice.h"
+ #endif
+@@ -527,7 +531,8 @@ int main _P2((argc, argv), int argc, cha
  
      rmlocks();	
  
diff --git a/comms/mgetty+sendfax/patches/patch-faxrec.c b/comms/mgetty+sendfax/patches/patch-faxrec.c
new file mode 100644
index 00000000000..d93eea59883
--- /dev/null
+++ b/comms/mgetty+sendfax/patches/patch-faxrec.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-faxrec.c,v 1.1 2013/03/28 21:17:57 joerg Exp $
+
+--- faxrec.c.orig	2013-03-28 20:03:52.000000000 +0000
++++ faxrec.c
+@@ -22,6 +22,10 @@
+ #include <sys/times.h>
+ #include <sys/stat.h>
+ 
++#ifdef __NetBSD__
++#include <utmpx.h>
++#endif
++
+ #ifndef sunos4
+ #include <sys/ioctl.h>
+ #endif
diff --git a/comms/mgetty+sendfax/patches/patch-g3_g3cat.c b/comms/mgetty+sendfax/patches/patch-g3_g3cat.c
new file mode 100644
index 00000000000..5fe8fb686eb
--- /dev/null
+++ b/comms/mgetty+sendfax/patches/patch-g3_g3cat.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-g3_g3cat.c,v 1.1 2013/03/28 21:17:57 joerg Exp $
+
+--- g3/g3cat.c.orig	2013-03-28 20:08:27.000000000 +0000
++++ g3/g3cat.c
+@@ -44,7 +44,7 @@ static int b_written = 0;		/* bytes of a
+ 					/* written */
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+@@ -67,7 +67,7 @@ void putcode _P2( (code, len), int code,
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putwhitespan _P1( (l), int l )
+ {
+@@ -98,7 +98,7 @@ void putwhitespan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putblackspan _P1( (l), int l )
+ {
+@@ -129,7 +129,7 @@ void putblackspan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
diff --git a/comms/mgetty+sendfax/patches/patch-g3_pbm2g3.c b/comms/mgetty+sendfax/patches/patch-g3_pbm2g3.c
new file mode 100644
index 00000000000..c52d61f0ad3
--- /dev/null
+++ b/comms/mgetty+sendfax/patches/patch-g3_pbm2g3.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-g3_pbm2g3.c,v 1.1 2013/03/28 21:17:57 joerg Exp $
+
+--- g3/pbm2g3.c.orig	2013-03-28 20:08:30.000000000 +0000
++++ g3/pbm2g3.c
+@@ -40,7 +40,7 @@ static unsigned int out_hibit = 0;
+ static int out_byte_tab[ 256 ];			/* for g3 byte reversal */
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putcode _P2( (code, len), int code, int len )
+ {
+@@ -60,7 +60,7 @@ void putcode _P2( (code, len), int code,
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void puteol _P0( void )			/* write byte-aligned EOL */
+ {
+@@ -69,7 +69,7 @@ void puteol _P0( void )			/* write byte-
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putwhitespan _P1( (l), int l )
+ {
+@@ -100,7 +100,7 @@ void putwhitespan _P1( (l), int l )
+ }
+ 
+ #ifdef __GNUC__
+-inline
++static inline
+ #endif
+ void putblackspan _P1( (l), int l )
+ {
diff --git a/comms/mgetty+sendfax/patches/patch-login.c b/comms/mgetty+sendfax/patches/patch-login.c
new file mode 100644
index 00000000000..e5bc6627891
--- /dev/null
+++ b/comms/mgetty+sendfax/patches/patch-login.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-login.c,v 1.1 2013/03/28 21:17:57 joerg Exp $
+
+--- login.c.orig	2013-03-28 20:03:37.000000000 +0000
++++ login.c
+@@ -19,6 +19,10 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
++#ifdef __NetBSD__
++#include <utmpx.h>
++#endif
++
+ /* NeXTStep/86 has some byte order problems (Christian Starkjohann) */
+ #if defined(NeXT) && defined(__LITTLE_ENDIAN__) && !defined(NEXTSGTTY)
+ # define pw_uid pw_short_pad1