Fix build on SunOS.

15 files changed, 174 insertions, 43 deletions

diff --git a/comms/malsync/distinfo b/comms/malsync/distinfo
index 03ef275e58b..84bcbaf7b47 100644
--- a/comms/malsync/distinfo
+++ b/comms/malsync/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2007/01/26 01:50:54 markd Exp $
+$NetBSD: distinfo,v 1.7 2012/02/16 17:25:16 hans Exp $
 
 SHA1 (malsync_2.2.0.src.tar.gz) = c8400205b3f8770c105c9f62afdba20c94b85c26
 RMD160 (malsync_2.2.0.src.tar.gz) = 14be8ba01c20969eed8d7b718284880e0bbd424f
 Size (malsync_2.2.0.src.tar.gz) = 173851 bytes
-SHA1 (patch-aa) = 412ed5a2257241cd41c3b56689965eb550f4374f
+SHA1 (patch-aa) = 616a237452a3f408b6cce199ce338746e8fa3149
 SHA1 (patch-ab) = de38ceb03f777bac1f4612517850e023dee946b7
 SHA1 (patch-ac) = a0ffae72d282e6b9276b8e16b909010e6e9c9b1e
 SHA1 (patch-ad) = 2c9f6f3b60ba1d198e6752c7f0ec239727ae78e7
+SHA1 (patch-mal_common_AGUtilUnix.h) = 3e8a09ef8a9d6e6e56a3cfdddb42e91bb9a9995a
diff --git a/comms/malsync/patches/patch-aa b/comms/malsync/patches/patch-aa
index 6dff16376c9..97b2f1012b9 100644
--- a/comms/malsync/patches/patch-aa
+++ b/comms/malsync/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2007/01/26 01:50:54 markd Exp $
+$NetBSD: patch-aa,v 1.5 2012/02/16 17:25:16 hans Exp $
 
 --- Makefile.orig	2003-05-31 11:42:14.000000000 +1200
 +++ Makefile
@@ -18,7 +18,18 @@ $NetBSD: patch-aa,v 1.4 2007/01/26 01:50:54 markd Exp $
  
  CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
    -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \
-@@ -72,8 +73,8 @@ DYNLINK = -rdynamic
+@@ -59,10 +60,6 @@ SRC = malsync.c  \
+   $(TREETOP)/mal/client/common/AGSyncProcessor.c \
+   $(TREETOP)/mal/common/AGServerConfig.c
+ 
+-ifeq ($(PLAT),SunOS)
+-SRC += ap_snprintf.c
+-endif
+-
+ OBJS = $(SRC:.c=.o)
+ 
+ ifeq ($(PLAT),Darwin)
+@@ -72,8 +69,8 @@ DYNLINK = -rdynamic
  endif
  
  $(TARGET): $(OBJS)
diff --git a/comms/malsync/patches/patch-mal_common_AGUtilUnix.h b/comms/malsync/patches/patch-mal_common_AGUtilUnix.h
new file mode 100644
index 00000000000..35b6fa508b5
--- /dev/null
+++ b/comms/malsync/patches/patch-mal_common_AGUtilUnix.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mal_common_AGUtilUnix.h,v 1.1 2012/02/16 17:25:16 hans Exp $
+
+--- mal/common/AGUtilUnix.h.orig	2000-05-14 23:17:36.000000000 +0200
++++ mal/common/AGUtilUnix.h	2012-01-26 17:39:25.909557059 +0100
+@@ -46,8 +46,6 @@ extern "C" {
+ #include <httpd.h>
+ #include <ap.h>
+ #endif
+-#define snprintf ap_snprintf
+-#define vsnprintf ap_vsnprintf
+ #endif
+ 
+ #endif /* __unix__ */
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 92095dc6e1e..37fe6459f99 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2012/02/06 12:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2012/02/16 17:29:24 hans Exp $
 
 DISTNAME=	mgetty1.1.37-Jun05
 PKGNAME=	mgetty-1.1.37
@@ -22,6 +22,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
 MAKE_ENV+=		MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q} PERL5=${PERL5:Q}
+MAKE_ENV+=		ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP}
 MAKE_FLAGS+=		prefix=${DESTDIR:Q}${PREFIX:Q}                  \
 			INFODIR=${DESTDIR:Q}${PREFIX:Q}/${PKGINFODIR:Q} \
 			MAN1DIR=${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man1\
@@ -31,6 +32,14 @@ MAKE_FLAGS+=		prefix=${DESTDIR:Q}${PREFIX:Q}                  \
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CONFDIR=${DESTDIR:Q}${EXAMPLES_DIR:Q}
 BUILD_MAKE_FLAGS=	${MAKE_FLAGS:S,${DESTDIR},,} CONFDIR=${PKG_SYSCONFDIR:Q}
 
+CFLAGS.SunOS+=		-Dsolaris2
+CFLAGS+=		-DDEVICE_GROUP=${ROOT_GROUP}
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "SunOS"
+LIBS+=			-lutil
+.endif
+
 USE_TOOLS+=		makeinfo perl:run
 
 INFO_FILES=		yes
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index c359085d687..7f363bc217b 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.32 2011/04/06 20:57:18 is Exp $
+$NetBSD: distinfo,v 1.33 2012/02/16 17:29:25 hans Exp $
 
 SHA1 (mgetty1.1.37-Jun05.tar.gz) = fec9672e8be29a41f1392c6bf90c0d5732cdb2c2
 RMD160 (mgetty1.1.37-Jun05.tar.gz) = 56aa9e213e4bd79c13ace2b7222253d91e756865
 Size (mgetty1.1.37-Jun05.tar.gz) = 1057939 bytes
 SHA1 (patch-aa) = f80c4e7f7eb23eac7ee23c2144612b82c122d45f
-SHA1 (patch-ab) = 292baa9f0f22beadec32d3dab4e037a2ee8a01fc
+SHA1 (patch-ab) = d40fab74e361c15cb525705de0c6d986ed599b71
 SHA1 (patch-ac) = bdc69ccc3430634bb74742fd105ee8f3fcde4d21
 SHA1 (patch-ad) = f02a92a3a9a46fe71d7541897da24470e38f68c7
 SHA1 (patch-af) = 088be22c69f39ca099cbe497b7e845bf103bf1c7
 SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
 SHA1 (patch-ah) = 0a3e5b1375eb36610e6a97113a8e535bf2fd1c6b
-SHA1 (patch-ai) = 2246b08b0211fb2dfb191f45f2599c1fba9a9744
+SHA1 (patch-ai) = e67cf18af31b34a6aef529d1114e03ce9e55cc68
 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab
index c4d85aee180..1b62bbf6baf 100644
--- a/comms/mgetty+sendfax/patches/patch-ab
+++ b/comms/mgetty+sendfax/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
+$NetBSD: patch-ab,v 1.13 2012/02/16 17:29:25 hans Exp $
 
 --- Makefile.orig	2010-06-05 09:48:22.000000000 +0000
 +++ Makefile
@@ -18,31 +18,40 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
 -CFLAGS=-O2 -Wall -pipe
-+CFLAGS=-O2 -Wall -pipe -DPREFIX=\"${PREFIX}\"
++CFLAGS+=-O2 -Wall -pipe -DPREFIX=\"${PREFIX}\"
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
-@@ -151,7 +151,7 @@ CFLAGS=-O2 -Wall -pipe
+@@ -150,8 +150,6 @@ CFLAGS=-O2 -Wall -pipe
+ # 	"utmp.o: unresolved symbol _login"
  # For Linux, add "-lutil" if the linker complains about "updwtmp".
  #
- LDFLAGS=
+-LDFLAGS=
 -LIBS=
-+LIBS=-lutil
  #LIBS=-lprot -lsocket				# SCO Unix
  #LIBS=-lsocket
  #LIBS=-lbsd					# OSF/1
-@@ -171,8 +171,8 @@ LIBS=
+@@ -171,8 +169,8 @@ LIBS=
  #
  # if your systems doesn't have one, use the shell script that I provide
  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
 -INSTALL=install -c -o bin -g bin
 -#INSTALL=install -c -o root -g wheel		# NeXT/BSD
 +#INSTALL=install -c -o bin -g bin
-+INSTALL=install -c -o root -g wheel		# NeXT/BSD
++INSTALL=install -c -o ${ROOT_USER} -g ${ROOT_GROUP}	# NeXT/BSD
  #INSTALL=/usr/ucb/install -c -o bin -g bin	# AIX, Solaris 2.x
  #INSTALL=installbsd -c -o bin -g bin		# OSF/1, AIX 4.1, 4.2
  #INSTALL=/usr/bin/X11/bsdinst -c -o bin 	# IRIX
-@@ -265,12 +265,12 @@ AWK=awk
+@@ -247,7 +245,7 @@ INFODIR=$(prefix)/info
+ #  Usually this will be /bin/sh or /usr/bin/sh, but bash or ksh are fine.
+ #  (on some ultrix systems, you may need /bin/sh5 here)
+ #
+-SHELL=/bin/sh
++#SHELL=/bin/sh
+ #
+ # If your shell requires pre-posix syntax to disable traps ('trap 0' 
+ #  instead of 'trap - 0'), set this to "0" (very rarely needed)
+@@ -265,12 +263,12 @@ AWK=awk
  # and the "tkperl" frontends without PERL, so don't worry if you don't
  # have it.
  # If you specify command line arguments (-w), don't forget the quotes!
@@ -57,7 +66,7 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  #
  #
  # An echo program that understands escapes like "\n" for newline or
-@@ -282,9 +282,9 @@ TKPERL=/usr/bin/tkperl
+@@ -282,9 +280,9 @@ TKPERL=/usr/bin/tkperl
  # please use the "mg.echo" program provided in the compat/ subdirectory.
  # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo
  #
@@ -69,7 +78,7 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  
  #
  # for mgetty, that's it. If you want to use the voice
-@@ -292,7 +292,7 @@ ECHO="echo"
+@@ -292,7 +290,7 @@ ECHO="echo"
  
  # To maintain security, I recommend creating a new group for
  # users who are allowed to manipulate the recorded voice messages.
@@ -78,7 +87,7 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  PHONE_PERMS=770
  
  # Add -DNO_STRSTR to CFLAGS if you don't have strstr().
-@@ -324,7 +324,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode
+@@ -324,7 +322,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode
  
  all:	bin-all doc-man-only
  
@@ -87,7 +96,7 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  
  # a few C files need extra compiler arguments
  
-@@ -572,8 +572,8 @@ newslock: compat/newslock.c
+@@ -572,8 +570,8 @@ newslock: compat/newslock.c
  # internal: use this to create a "clean" mgetty+sendfax tree
  bindist: all doc-all sedscript
  	-rm -rf bindist
@@ -98,7 +107,7 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  		BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \
  		LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \
  		spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \
-@@ -585,7 +585,7 @@ bindist: all doc-all sedscript
+@@ -585,7 +583,7 @@ bindist: all doc-all sedscript
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -107,7 +116,7 @@ $NetBSD: patch-ab,v 1.12 2011/04/06 20:57:19 is Exp $
  
  install.bin: mgetty sendfax newslock \
  		login.config mgetty.config sendfax.config 
-@@ -593,7 +593,7 @@ install.bin: mgetty sendfax newslock \
+@@ -593,7 +591,7 @@ install.bin: mgetty sendfax newslock \
  # binaries
  #
  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai
index 84b4e25adca..6ba9f321b12 100644
--- a/comms/mgetty+sendfax/patches/patch-ai
+++ b/comms/mgetty+sendfax/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2009/10/02 19:21:59 is Exp $
+$NetBSD: patch-ai,v 1.7 2012/02/16 17:29:25 hans Exp $
 
 --- policy.h.orig	2009-10-02 11:51:33.000000000 +0200
 +++ policy.h
-@@ -593,6 +593,22 @@
+@@ -593,6 +593,21 @@
   */
  #define	MINFREESPACE 1024
  
@@ -21,11 +21,10 @@ $NetBSD: patch-ai,v 1.6 2009/10/02 19:21:59 is Exp $
 +#define MAILER          "/usr/sbin/sendmail"
 +
 +#undef DEVICE_GROUP
-+#define DEVICE_GROUP    "wheel"
  /* fax machines exchange so-called "non-standard-frames" that can be 
   * used to identify what vendor and model is on the other end.
   * mgetty parses and prints this by default, because it can help 
-@@ -601,3 +617,4 @@
+@@ -601,3 +616,4 @@
   */
  #define FAX_NSF_PARSER
  
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 434fbaa2ac9..5824f483f0c 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/30 00:07:11 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2012/02/16 17:32:45 hans Exp $
 
 DISTNAME=	modemd-970221
 PKGNAME=	modemd-19970221
@@ -9,17 +9,27 @@ MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
 MAINTAINER=	tsarna@NetBSD.org
 COMMENT=	Replacement getty for dialup ttys and a modem server
 
+USE_TOOLS+=	nroff
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
 MANCOMPRESSED_IF_MANZ=	yes
 
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP}
-MAKE_ENV+=	MANOWN=${MANOWN} MANGRP=${MANGRP}
+MAKE_ENV+=	LIBS=${LIBS:Q}
+USE_BSD_MAKEFILE=	yes
 
 INSTALLATION_DIRS=	${PKGMANDIR}/cat5 ${PKGMANDIR}/man5 \
 			${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 \
 			sbin share/examples/modemd
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "SunOS"
+LIBS+=		-lutil
+.endif
+
+LIBS.SunOS+=	-lsocket -lnsl
+CFLAGS.SunOS+=	-DFILIO_H -DNO_STRING_H -DNTELOPTS=40
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/modemd/distinfo b/comms/modemd/distinfo
index 9ed11ad4e64..a900c61025a 100644
--- a/comms/modemd/distinfo
+++ b/comms/modemd/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.11 2011/12/19 13:25:22 wiz Exp $
+$NetBSD: distinfo,v 1.12 2012/02/16 17:32:45 hans Exp $
 
 SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3
 RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9
 Size (modemd-970221.tar.gz) = 56093 bytes
 SHA1 (patch-aa) = 093d70c98c5fa21f3c5fff8dc5092ca0afa365ef
-SHA1 (patch-ab) = fd0382bd007ea3be2be0983db8e78a865ceb0d20
-SHA1 (patch-ac) = 55f4bf4b57e1c42becb816ac4982620c42a5bf1a
-SHA1 (patch-ad) = e8c78c84b9ab58644d8e2e105416d5ef5b59fba4
+SHA1 (patch-ab) = 711b600d5dfa11e859f6af1124aaa18224b37ad3
+SHA1 (patch-ac) = fe3898ea85204631e31c49a8872855c0e7c09e9d
+SHA1 (patch-ad) = f18d3ffe0658ef2709eb28d342b31361b86b1b0b
 SHA1 (patch-ae) = 44e38979c686f66a22e3fd3b027cb9129b6266ba
 SHA1 (patch-af) = c438c7ddaa223ae5bdb5b4fd11c5d6304eec4008
-SHA1 (patch-ag) = 8d93d4da055170a19336e127017dfe42501a0538
+SHA1 (patch-ag) = 3505bf5b749288de673970ea95ab3196669feca9
 SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d
 SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa
 SHA1 (patch-aj) = 2837ce9ac377aa6b4f7a8c96f63ff80fcdee9b17
@@ -22,7 +22,8 @@ SHA1 (patch-ap) = ed747dc8ef3419bc4431d934aaf4692cadd0ade4
 SHA1 (patch-aq) = f77b4b16b12ca74e897372f328e850a3d9b52229
 SHA1 (patch-ar) = 0fc63025d29a0bd626ec8a51f8c6a461bdbb84a4
 SHA1 (patch-as) = 5ac081a2200b72321973004803d15dd3b9d387b3
-SHA1 (patch-incoming_login.c) = 9ece373aee2ea8caa751752a5390decf390eef12
+SHA1 (patch-cf_sunos4.h) = efe0b9c58ad20247cbc313c1569f9d0be8901d14
+SHA1 (patch-incoming_login.c) = 62784076e0ac1e23e2e7a6f8c248f3e1fa6b6293
 SHA1 (patch-outgoing_tn.c) = 133c714eb6d33912f6edfcd12034b3155707d701
 SHA1 (patch-outgoing_tnstate.c) = da65871a0397c13e1cd345c1832e3cfbe188f629
 SHA1 (patch-outgoing_tnutil.c) = ef8b3f32a6e491d6fa56ba3a8f8c4ee64a368cc9
diff --git a/comms/modemd/patches/patch-ab b/comms/modemd/patches/patch-ab
index cc0844c16e5..099b5480147 100644
--- a/comms/modemd/patches/patch-ab
+++ b/comms/modemd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2011/11/25 21:34:34 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
 
 --- common/ttio.c.orig	1997-02-21 23:06:09.000000000 +0000
 +++ common/ttio.c
-@@ -45,12 +45,15 @@ static char copyright[] =
+@@ -45,12 +45,19 @@ static char copyright[] =
  #include "osdep.h"
  #include "cdefs.h"
  #include "global.h"
@@ -14,7 +14,11 @@ $NetBSD: patch-ab,v 1.4 2011/11/25 21:34:34 joerg Exp $
  #include "ttio.h"
  #include <pwd.h>
 +#include <stdlib.h>
++#ifndef __sun
 +#include <util.h>
++#else
++#include <sys/file.h>
++#endif
  
  static void dectl PROTO ((char *, int, char *, int, char *));
  
diff --git a/comms/modemd/patches/patch-ac b/comms/modemd/patches/patch-ac
index e8de332c62b..7469f3a4893 100644
--- a/comms/modemd/patches/patch-ac
+++ b/comms/modemd/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2007/10/10 16:53:58 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2012/02/16 17:32:45 hans Exp $
 
 --- incoming/ppp.c.orig	1996-09-10 00:35:12.000000000 +0000
 +++ incoming/ppp.c	2007-10-10 16:49:36.000000000 +0000
@@ -13,6 +13,15 @@ $NetBSD: patch-ac,v 1.3 2007/10/10 16:53:58 rillig Exp $
  
  void ppp_detect (tty, ttyName)
       int tty;
+@@ -79,7 +79,7 @@ void ppp_detect (tty, ttyName)
+ 	modemcap.luser = "ppp";
+ 	modemcap.program = modemcap.ppp_prog;
+ 	modemcap.logstderr = 1;
+-	setlogin (ttyName);
++	SETLOGIN (ttyName);
+ 	return;
+       }
+     else
 @@ -125,7 +125,7 @@ void ppp_detect (tty, ttyName)
  	    if (!lbuf)
  	      error ("Can't allocate space for login string.\n");
diff --git a/comms/modemd/patches/patch-ad b/comms/modemd/patches/patch-ad
index 6a236afb7b6..9d5da7ffac8 100644
--- a/comms/modemd/patches/patch-ad
+++ b/comms/modemd/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:45 agc Exp $
+$NetBSD: patch-ad,v 1.3 2012/02/16 17:32:45 hans Exp $
 
 --- incoming/Makefile.orig	Tue Sep 10 03:08:00 1996
 +++ incoming/Makefile	Tue Mar  3 17:19:06 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:45 agc Exp $
  LIBDIR = ${.OBJDIR:S/incoming/common/g}
  DPADD = ${LIBDIR}/libmodemd.a
 -LDADD = ${DPADD}
-+LDADD = ${DPADD} -lutil
++LDADD = ${DPADD} ${LIBS}
  
  CFLAGS += -I${.CURDIR}/.. -I${.CURDIR}/../include
  
diff --git a/comms/modemd/patches/patch-ag b/comms/modemd/patches/patch-ag
index 71c42629643..5534bad0254 100644
--- a/comms/modemd/patches/patch-ag
+++ b/comms/modemd/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:36:45 agc Exp $
+$NetBSD: patch-ag,v 1.3 2012/02/16 17:32:45 hans Exp $
 
 --- outgoing/Makefile.orig	Tue Sep 10 03:08:00 1996
 +++ outgoing/Makefile	Tue Mar  3 17:19:07 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.2 1998/08/07 10:36:45 agc Exp $
  
  DPADD = ${LIBDIR}/libmodemd.a
 -LDADD = ${DPADD}
-+LDADD = ${DPADD} -lutil
++LDADD = ${DPADD} ${LIBS}
  
  .include "../Makefile.inc"
  .include <bsd.prog.mk>
diff --git a/comms/modemd/patches/patch-cf_sunos4.h b/comms/modemd/patches/patch-cf_sunos4.h
new file mode 100644
index 00000000000..2480ff5424c
--- /dev/null
+++ b/comms/modemd/patches/patch-cf_sunos4.h
@@ -0,0 +1,55 @@
+$NetBSD: patch-cf_sunos4.h,v 1.1 2012/02/16 17:32:45 hans Exp $
+
+--- cf/sunos4.h.orig	1997-02-22 00:06:27.000000000 +0100
++++ cf/sunos4.h	2012-01-26 18:21:36.676350683 +0100
+@@ -70,7 +70,6 @@
+ #define _PATH_UTMP      "/etc/utmp"
+ #define _PATH_WTMP      "/var/adm/wtmp"
+ #define _PATH_LASTLOG   "/var/adm/lastlog"
+-#define _PATH_MPOOL_PID	"/etc/mpoold.pid"
+ 
+ #define UT_NAMESIZE     8
+ #define UT_LINESIZE     8
+@@ -115,6 +114,28 @@
+ 		  (warn ("%d baud not supported: using 38400", speed),	\
+ 		   B38400))))))))))))))))
+ 
++#define NORMAL_TTY(ts)					\
++  ((ts.c_iflag |= ICRNL | IMAXBEL | BRKINT),		\
++   (ts.c_oflag |= OPOST | ONLCR),			\
++   (ts.c_cflag = (ts.c_cflag & ~CLOCAL) | HUPCL),	\
++   (ts.c_lflag |= (ICANON | ISIG | IEXTEN | ECHO | 	\
++		    ECHOE | ECHOKE | ECHOCTL | PENDIN)),\
++   (ts.c_cc [VEOF] = 4),	/* Control D */		\
++   (ts.c_cc [VEOL] = _POSIX_VDISABLE),			\
++   (ts.c_cc [VEOL2] = _POSIX_VDISABLE),			\
++   (ts.c_cc [VERASE] = 127),	/* Delete */		\
++   (ts.c_cc [VWERASE] = 23),	/* Control W */		\
++   (ts.c_cc [VKILL] = 21),	/* Control U */		\
++   (ts.c_cc [VREPRINT] = 18),	/* Control R */		\
++   (ts.c_cc [VINTR] = 3),	/* Control C */		\
++   (ts.c_cc [VQUIT] = 28),	/* Control \ */		\
++   (ts.c_cc [VSUSP] = 26),	/* Control Z */		\
++   (ts.c_cc [VDSUSP] = 6),	/* Control F */		\
++   (ts.c_cc [VSTART] = 17),	/* Control Q */		\
++   (ts.c_cc [VSTOP] = 19),	/* Control S */		\
++   (ts.c_cc [VLNEXT] = 22),	/* Control V */		\
++   (ts.c_cc [VDISCARD] = _POSIX_VDISABLE))
++
+ #define SET_TX_SPEED(ts, speed)						\
+   (ts.c_cflag = (ts.c_cflag & ~CBAUD) |					\
+    CVT_BAUD (speed))
+@@ -133,8 +154,9 @@
+ #define	_PATH_TTYLOCK	"/var/spool/locks/LCK..%s"
+ 
+ /* Varargs stuff... */
+-#include <varargs.h>
+-#define VA_DOTDOTDOT va_alist
+-#define VA_start(list, last) va_start (list)
++#include <stdarg.h>
++#define VA_DOTDOTDOT ...
++#define va_dcl
++#define VA_start(list, last) va_start (list, last)
+ 
+-#define vsnprintf(buf, size, fmt, list) vsprintf (buf, fmt, list)
++#define _PATH_MPOOL_PID	"/var/run/mpoold.pid"
diff --git a/comms/modemd/patches/patch-incoming_login.c b/comms/modemd/patches/patch-incoming_login.c
index a808600b30c..4f79ecbdece 100644
--- a/comms/modemd/patches/patch-incoming_login.c
+++ b/comms/modemd/patches/patch-incoming_login.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-incoming_login.c,v 1.1 2011/11/25 21:34:34 joerg Exp $
+$NetBSD: patch-incoming_login.c,v 1.2 2012/02/16 17:32:45 hans Exp $
 
 --- incoming/login.c.orig	2011-11-25 20:00:14.000000000 +0000
 +++ incoming/login.c
@@ -10,3 +10,13 @@ $NetBSD: patch-incoming_login.c,v 1.1 2011/11/25 21:34:34 joerg Exp $
  #include "mcap.h"
  #include "ttio.h"
  
+@@ -70,7 +71,9 @@ void do_login (name, ttyName)
+   /* At this point, we have carrier, so it's time to log the login... */
+   strncpy (utRec.ut_line, ttyName, UT_LINESIZE);
+   strncpy (utRec.ut_name, name, UT_NAMESIZE);
++#ifndef __sun
+   utRec.ut_host [0] = 0;
++#endif
+ 
+   loginout ();
+ }