Fix build on SunOS.

4 files changed, 39 insertions, 22 deletions

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