Move gcc specific options to configure script; address to pkg PR/28900.

And care for sendmail path for IRIX though IRIX has never tested
yatsvrs to work.

Bump PKGREVISION.

6 files changed, 61 insertions, 21 deletions

diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index ba8e9c00432..021dcb6f746 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/12/15 13:18:02 taca Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/08 09:39:56 taca Exp $
 #
 
 DISTNAME=		yatsvrs-5.00p6
 PKGNAME=		${DISTNAME:S/p/./}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.jone-system.com/pub/jepro/yatsvr/
 
diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo
index 6030e337a29..a69500c7697 100644
--- a/mail/yatsvrs/distinfo
+++ b/mail/yatsvrs/distinfo
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.7 2004/12/15 13:18:02 taca Exp $
+$NetBSD: distinfo,v 1.8 2005/01/08 09:39:56 taca Exp $
 
 SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f
 Size (yatsvrs-5.00p6.tar.gz) = 210067 bytes
 SHA1 (patch-aa) = 33b8ed3f600c6d4ce4492b88d004fb1f954fdc24
-SHA1 (patch-ab) = b460344ec577ef0a61d84bffbcf6c2c2e6fb2afb
+SHA1 (patch-ab) = e5db32324dc4d801f468db985ac99e687c41089d
 SHA1 (patch-ac) = e34b2364f0039a135a7ebcd24c84b6d101581489
 SHA1 (patch-ad) = 392b8f6abd208c9387b2953792af2638aacbae23
 SHA1 (patch-ae) = 20f860d23b990eebe0c0e4a3f36ae658032a0c61
 SHA1 (patch-af) = e91f015118fb5ab95fccecf09205198894f89395
 SHA1 (patch-ag) = 8f339d58bea6ee8d04c3df7258b6ecb901602852
 SHA1 (patch-ah) = cdd32e7a7474b94601c69c4ab6a304542af7da42
-SHA1 (patch-ai) = f0f7d8fe5b6dc25fab2d9e73809b084b8e4729c6
+SHA1 (patch-ai) = 43ec227de986c3f2170deceb24444974773bb3a3
 SHA1 (patch-aj) = fc13d80bc08a84d86e627adad167d96684151541
 SHA1 (patch-ak) = ec11aabeca579944e78053065759986cb96c1da2
 SHA1 (patch-al) = eed8524c6dfabdb03cabd556abfa38b4f16aecac
 SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211
 SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc
-SHA1 (patch-aq) = a09b4f8869e2231b3715155b85b690901926a4e5
+SHA1 (patch-aq) = ea2d7d2f21ebe3aea163d6de0a95060be2ecc381
 SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66
 SHA1 (patch-as) = e6c5d58794a283a285bb54d1792ccb2b84bb9495
 SHA1 (patch-at) = 73704aa7d506c5a97f4fef3cc03e6ac8e983497e
@@ -39,6 +39,6 @@ SHA1 (patch-bj) = 50728ec84bee5177f60695fe3cff4c595636b300
 SHA1 (patch-bk) = f3ae9b2bc8ef898e85739f8a2361752062c545f7
 SHA1 (patch-bl) = 37b01451503a5b8035ea872b349ef4dff89cccd4
 SHA1 (patch-bm) = e5d8e27c820e1d23254e3b8250def76045029b4d
-SHA1 (patch-bn) = db1856428d1abffa14191442dadca1a5b2a76de7
+SHA1 (patch-bn) = bef58405d86167fb566942cdef24182be67e46c8
 SHA1 (patch-bo) = 95b8c7de41628700bd52c6428e92d489087df8b1
 SHA1 (patch-bp) = ae6cf703bca51589fe15d11f3f8aac3c04454f34
diff --git a/mail/yatsvrs/patches/patch-ab b/mail/yatsvrs/patches/patch-ab
index 57e16f32d5c..feb8e81d5ab 100644
--- a/mail/yatsvrs/patches/patch-ab
+++ b/mail/yatsvrs/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/08 09:39:57 taca Exp $
 
---- ascyd/Makefile.in.orig	Mon Jul  9 18:19:12 2001
+--- ascyd/Makefile.in.orig	2001-12-20 21:31:52.000000000 +0900
 +++ ascyd/Makefile.in
-@@ -125,18 +125,18 @@
+@@ -68,7 +68,7 @@ VERSION = @VERSION@
+ YAT5SYSDIR = @YAT5SYSDIR@
+ YATSYSDIROLD = @YATSYSDIROLD@
+ 
+-AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" 	-DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes # -Werror
++AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" 	-DYAT5SYSDIR=\"$(YAT5SYSDIR)\"
+ 
+ sbin_PROGRAMS = ascyd
+ ascyd_SOURCES = apop.c ascy.h entry.c error.c etc.c greeting.c init.c lock.c 	message.c msg2cmd.c newpass.c newsecret.c pass.c prototype.h 	quit.c sighand.c user.c ver.c version.h 
+@@ -125,18 +125,18 @@ maintainer-clean-sbinPROGRAMS:
  
  install-sbinPROGRAMS: $(sbin_PROGRAMS)
  	@$(NORMAL_INSTALL)
@@ -25,7 +34,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
  	done
  
  .c.o:
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs:
diff --git a/mail/yatsvrs/patches/patch-ai b/mail/yatsvrs/patches/patch-ai
index 75526d0cfbb..d9b67e5b750 100644
--- a/mail/yatsvrs/patches/patch-ai
+++ b/mail/yatsvrs/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
+$NetBSD: patch-ai,v 1.2 2005/01/08 09:39:57 taca Exp $
 
---- yatconfd/Makefile.in.orig	Mon Jul  9 18:19:11 2001
+--- yatconfd/Makefile.in.orig	2001-12-20 21:31:51.000000000 +0900
 +++ yatconfd/Makefile.in
-@@ -127,18 +127,18 @@
+@@ -68,7 +68,7 @@ VERSION = @VERSION@
+ YAT5SYSDIR = @YAT5SYSDIR@
+ YATSYSDIROLD = @YATSYSDIROLD@
+ 
+-AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" 	-DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes 
++AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" 	-DYAT5SYSDIR=\"$(YAT5SYSDIR)\"
+ 
+ 
+ sbin_PROGRAMS = yatconfd
+@@ -127,18 +127,18 @@ maintainer-clean-sbinPROGRAMS:
  
  install-sbinPROGRAMS: $(sbin_PROGRAMS)
  	@$(NORMAL_INSTALL)
@@ -25,7 +34,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
  	done
  
  .c.o:
-@@ -268,7 +268,7 @@
+@@ -268,7 +268,7 @@ all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs:
diff --git a/mail/yatsvrs/patches/patch-aq b/mail/yatsvrs/patches/patch-aq
index c3588db9b0e..54a3413da0e 100644
--- a/mail/yatsvrs/patches/patch-aq
+++ b/mail/yatsvrs/patches/patch-aq
@@ -1,8 +1,17 @@
-$NetBSD: patch-aq,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
+$NetBSD: patch-aq,v 1.2 2005/01/08 09:39:57 taca Exp $
 
---- yatd/Makefile.in.orig	Mon Jul  9 18:19:10 2001
+--- yatd/Makefile.in.orig	2001-12-20 21:31:51.000000000 +0900
 +++ yatd/Makefile.in
-@@ -132,18 +132,18 @@
+@@ -68,7 +68,7 @@ VERSION = @VERSION@
+ YAT5SYSDIR = @YAT5SYSDIR@
+ YATSYSDIROLD = @YATSYSDIROLD@
+ 
+-AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" 	-DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes # -Werror
++AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" 	-DYAT5SYSDIR=\"$(YAT5SYSDIR)\"
+ 
+ 
+ sbin_PROGRAMS = yatd
+@@ -132,18 +132,18 @@ maintainer-clean-sbinPROGRAMS:
  
  install-sbinPROGRAMS: $(sbin_PROGRAMS)
  	@$(NORMAL_INSTALL)
@@ -25,7 +34,7 @@ $NetBSD: patch-aq,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $
  	done
  
  .c.o:
-@@ -371,7 +371,7 @@
+@@ -371,7 +371,7 @@ all-redirect: all-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs:
diff --git a/mail/yatsvrs/patches/patch-bn b/mail/yatsvrs/patches/patch-bn
index d39fe956943..085a83967b4 100644
--- a/mail/yatsvrs/patches/patch-bn
+++ b/mail/yatsvrs/patches/patch-bn
@@ -1,13 +1,26 @@
-$NetBSD: patch-bn,v 1.1 2004/12/15 13:18:02 taca Exp $
+$NetBSD: patch-bn,v 1.2 2005/01/08 09:39:57 taca Exp $
 
 --- configure.orig	2001-12-20 16:23:50.000000000 +0900
 +++ configure
+@@ -1016,9 +1016,9 @@ else
+     CFLAGS=
+   fi
+ fi
+-
+-
+-
++if test $ac_cv_prog_gcc = yes; then
++  CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
++fi
+ 
+ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+ echo "configure:1025: checking for ${CC-cc} option to accept ANSI C" >&5
 @@ -3929,6 +3929,10 @@ test -n "$MAIL_COMMAND" && break
  done
  test -n "$MAIL_COMMAND" || MAIL_COMMAND="no"
  
 +   case "${OPSYS}" in
-+   SunOS)	MAIL_COMMAND="/usr/lib/sendmail";;
++   IRIX|SunOS)	MAIL_COMMAND="/usr/lib/sendmail";;
 +   *)		MAIL_COMMAND="/usr/sbin/sendmail";;
 +   esac
     if test "$MAIL_COMMAND" = "no" ; then