- Utilize bsd.pkg.install.mk framework.

- Add fallback sendmail path, should fix some buld build problem.
- Add -x option which enable XTND command support to yatd(8).

Bump PKGREVISION.

9 files changed, 107 insertions, 84 deletions

diff --git a/mail/yatsvrs/DEINSTALL b/mail/yatsvrs/DEINSTALL
index 2ca814e9042..a7e9d0d4d0c 100644
--- a/mail/yatsvrs/DEINSTALL
+++ b/mail/yatsvrs/DEINSTALL
@@ -1,42 +1,24 @@
 #!/bin/sh
-# $Id: DEINSTALL,v 1.2 2001/12/19 04:11:07 taca Exp $
-
-AWK="@AWK@"
-CAT="@CAT@"
-CMP="@CMP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
+# $Id: DEINSTALL,v 1.3 2004/12/15 13:18:02 taca Exp $
 
 YAT_CONF_DIR="@PKG_SYSCONFDIR@"
-YAT_EXAMPLES_DIR="@EXAMPLESDIR@"
-EXAMPLES="@EXAMPLES@"
+DEFAULT_ADMIN="@DEFAULT_ADMIN@"
 MIN="@YATSVR_MINGID@"
 MAX="@YATSVR_MAXGID@"
 
 case "$2" in
 DEINSTALL)
 
-	for f in ${EXAMPLES}; do
-		if ${CMP} -s ${YAT_CONF_DIR}/$f ${YAT_EXAMPLES_DIR}/$f.example; then
-			${RM} ${YAT_CONF_DIR}/$f
-		fi
-	done
 	admin=`${CAT} ${YAT_CONF_DIR}/.admin`
-	if [ x$admin = x'root' ]; then
-		${RM} ${YAT_CONF_DIR}/.admin
+	if [ "$admin" = "${DEFAULT_ADMIN}" ]; then
+		${RM} -f ${YAT_CONF_DIR}/.admin
 	fi
 	${AWK} -F: '$1 !~ /^no/ { if ($3 < '$MIN' || $3 > '$MAX') print $1}' \
 		/etc/group > /tmp/hidden-group
 	if ${CMP} -s ${YAT_CONF_DIR}/.hidden-group /tmp/hidden-group; then
-		${RM} ${YAT_CONF_DIR}/.hidden-group
+		${RM} -f ${YAT_CONF_DIR}/.hidden-group
 	fi
 	${RM} -f /tmp/hidden-group
 	${RM} -f ${YAT_CONF_DIR}/*\~old
-	${RMDIR} ${YAT_CONF_DIR} >/dev/null 2>&1
-	if [ -d ${YAT_CONF_DIR} ]; then
-		${CAT} <<EOF
-If you would never want to use yatsvrs any more, remove ${YAT_CONF_DIR}.
-EOF
-	fi
 	;;
 esac
diff --git a/mail/yatsvrs/INSTALL b/mail/yatsvrs/INSTALL
index a989788b76e..c5ae1d5b672 100644
--- a/mail/yatsvrs/INSTALL
+++ b/mail/yatsvrs/INSTALL
@@ -1,33 +1,13 @@
 #!/bin/sh
-# $Id: INSTALL,v 1.3 2003/08/30 20:22:58 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-AWK="@AWK@"
-CHMOD="@CHMOD@"
-MKDIR="@MKDIR@"
-INSTALL_DATA="@YATSVR_INSTALL_DATA@"
+# $Id: INSTALL,v 1.4 2004/12/15 13:18:02 taca Exp $
 
 YAT_CONF_DIR="@PKG_SYSCONFDIR@"
-YAT_EXAMPLES_DIR="@EXAMPLESDIR@"
 DEFAULT_ADMIN="@DEFAULT_ADMIN@"
-EXAMPLES="@EXAMPLES@"
 MIN="@YATSVR_MINGID@"
 MAX="@YATSVR_MAXGID@"
 
 case ${STAGE} in
 POST-INSTALL)
-
-	if [ ! -d ${YAT_CONF_DIR} ]; then
-		${MKDIR} -p ${YAT_CONF_DIR}
-	fi
-	for f in ${EXAMPLES}; do
-		if [ ! -f ${YAT_CONF_DIR}/$f ]; then
-			${INSTALL_DATA} ${YAT_EXAMPLES_DIR}/$f.example \
-				${YAT_CONF_DIR}/$f
-		fi
-	done
 	if [ ! -f ${YAT_CONF_DIR}/.admin ]; then
 		echo ${DEFAULT_ADMIN} > ${YAT_CONF_DIR}/.admin
 		${CHMOD} 0600 ${YAT_CONF_DIR}/.admin
@@ -38,4 +18,3 @@ POST-INSTALL)
 	${CHMOD} 0600 ${YAT_CONF_DIR}/.hidden-group
 	;;
 esac
-exit 0
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index 02bc1c6c93b..ba8e9c00432 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/11/06 03:39:39 taca Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/15 13:18:02 taca Exp $
 #
 
 DISTNAME=		yatsvrs-5.00p6
 PKGNAME=		${DISTNAME:S/p/./}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.jone-system.com/pub/jepro/yatsvr/
 
@@ -13,13 +13,8 @@ COMMENT=		Extended POP3 server and some supporting servers
 
 CONFLICTS=		ascyd-* yatsvr4-*
 
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-
-YATSVR_LOGFAC?=		LOG_LOCAL4
-YATSVR_MINGID?=		1001
-YATSVR_MAXGID?=		64999
-PKG_SYSCONFSUBDIR?=	yatsvr5
-OLDCONFDIR=		${PREFIX}/etc/yat
 DOCS=			IMPORTANT README UPDATE doc/YATCONF doc/YATEXT4
 DOCDIR=			${PREFIX}/share/doc/yatsvr5
 EXAMPLES=		yatrc2 yatsvrrc
@@ -34,40 +29,35 @@ CONFIGURE_ARGS+=	--enable-shadow-password
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
-DEFAULT_ADMIN=		root
-
-FILES_SUBST+=		AWK=${AWK:Q}
-FILES_SUBST+=		CAT=${CAT:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		MKDIR=${MKDIR:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		RMDIR=${RMDIR:Q}
-FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+=		DEFAULT_ADMIN=${DEFAULT_ADMIN}
-FILES_SUBST+=		EXAMPLESDIR=${EXAMPLESDIR}
-FILES_SUBST+=		EXAMPLES=${EXAMPLES:Q}
-FILES_SUBST+=		YATSVR_INSTALL_DATA=${INSTALL_DATA:Q}
+FILES_SUBST+=		DEFAULT_ADMIN=${DEFAULT_YATADMIN}
 FILES_SUBST+=		YATSVR_MINGID=${YATSVR_MINGID}
 FILES_SUBST+=		YATSVR_MAXGID=${YATSVR_MAXGID}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+
+.for f in ${EXAMPLES}
+CONF_FILES+=		${EXAMPLESDIR}/$f	${PKG_SYSCONFDIR}/$f
+.endfor
+OWN_DIRS+=		${PKG_SYSCONFDIR}
 
-post-build:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+.include "../../mk/bsd.prefs.mk"
+
+YATSVR_LOGFAC?=		LOG_LOCAL4
+YATSVR_MINGID?=		1001
+YATSVR_MAXGID?=		64999
+DEFAULT_YATADMIN?=	root
+PKG_SYSCONFSUBDIR?=	yatsvr5
+OLDCONFDIR?=		${PKG_SYSCONFBASE}/yat
 
 post-install:
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}
 .endfor
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/sample/$f ${EXAMPLESDIR}/$f.example
+	${INSTALL_DATA} ${WRKSRC}/sample/$f ${EXAMPLESDIR}/$f
 .endfor
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/yatsvrs/PLIST b/mail/yatsvrs/PLIST
index 1e03b94fc3d..1db17050701 100644
--- a/mail/yatsvrs/PLIST
+++ b/mail/yatsvrs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/15 23:21:30 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/12/15 13:18:02 taca Exp $
 libexec/ascyd
 libexec/yatd
 libexec/yatconfd
@@ -8,6 +8,6 @@ share/doc/yatsvr5/UPDATE
 share/doc/yatsvr5/YATCONF
 share/doc/yatsvr5/YATEXT4
 @dirrm share/doc/yatsvr5
-share/examples/yatsvr5/yatrc2.example
-share/examples/yatsvr5/yatsvrrc.example
+share/examples/yatsvr5/yatrc2
+share/examples/yatsvr5/yatsvrrc
 @dirrm share/examples/yatsvr5
diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo
index 435fe27b98e..6030e337a29 100644
--- a/mail/yatsvrs/distinfo
+++ b/mail/yatsvrs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/09/10 10:41:59 agc Exp $
+$NetBSD: distinfo,v 1.7 2004/12/15 13:18:02 taca Exp $
 
 SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f
 Size (yatsvrs-5.00p6.tar.gz) = 210067 bytes
@@ -19,7 +19,7 @@ SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc
 SHA1 (patch-aq) = a09b4f8869e2231b3715155b85b690901926a4e5
 SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66
 SHA1 (patch-as) = e6c5d58794a283a285bb54d1792ccb2b84bb9495
-SHA1 (patch-at) = cecd3a6c32e225cb55046dee951bd0b09660fdc7
+SHA1 (patch-at) = 73704aa7d506c5a97f4fef3cc03e6ac8e983497e
 SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658
 SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2
 SHA1 (patch-aw) = 31a7f22c6e78b87d7bec66d0dd77641884ffb107
@@ -39,3 +39,6 @@ SHA1 (patch-bj) = 50728ec84bee5177f60695fe3cff4c595636b300
 SHA1 (patch-bk) = f3ae9b2bc8ef898e85739f8a2361752062c545f7
 SHA1 (patch-bl) = 37b01451503a5b8035ea872b349ef4dff89cccd4
 SHA1 (patch-bm) = e5d8e27c820e1d23254e3b8250def76045029b4d
+SHA1 (patch-bn) = db1856428d1abffa14191442dadca1a5b2a76de7
+SHA1 (patch-bo) = 95b8c7de41628700bd52c6428e92d489087df8b1
+SHA1 (patch-bp) = ae6cf703bca51589fe15d11f3f8aac3c04454f34
diff --git a/mail/yatsvrs/patches/patch-at b/mail/yatsvrs/patches/patch-at
index c8dc2dfea02..ef4c0d823ad 100644
--- a/mail/yatsvrs/patches/patch-at
+++ b/mail/yatsvrs/patches/patch-at
@@ -1,8 +1,35 @@
-$NetBSD: patch-at,v 1.2 2003/10/05 04:25:15 taca Exp $
+$NetBSD: patch-at,v 1.3 2004/12/15 13:18:02 taca Exp $
 
 --- yatd/entry.c.orig	2001-07-09 12:32:52.000000000 +0900
 +++ yatd/entry.c
-@@ -431,7 +431,7 @@ int main (argc, argv)
+@@ -106,6 +106,7 @@ struct SYS_DAT SysData = {
+ 
+   {  0, 0 },               /* flags */
+ 
++  0,			   /* allow_xtnd */
+ };
+ 
+ /* Autherization-User state commands */
+@@ -338,7 +339,7 @@ int CheckArgs(argc, argv)
+     LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7,
+   };
+ 
+-  while ((c = getopt(argc, argv, "d01234567s:")) != EOF) {
++  while ((c = getopt(argc, argv, "d01234567s:x")) != EOF) {
+     switch (c) {
+     case 'd': /* DEBUG option */
+       SysData.fDebug = 1;
+@@ -346,6 +347,9 @@ int CheckArgs(argc, argv)
+     case 's': /* System Directory */
+       strcpy(SysData.szSysDir, optarg);
+       break;
++    case 'x':
++      SysData.allow_xtnd = 1;
++      break;
+     default:
+       if ((c < '0') || ('7' < c)) {
+ 	fprintf(stderr, "Usage: %.256s [-d]\n", argv[0]);
+@@ -431,7 +435,7 @@ int main (argc, argv)
    Msg2Cli(SUCCESS, "%.512s @%.256s",
  	  szGreeting , SysData.szMyHost);
  #else
@@ -11,7 +38,7 @@ $NetBSD: patch-at,v 1.2 2003/10/05 04:25:15 taca Exp $
  	  szGreeting,
  	  SysData.pid, SysData.timeStart, SysData.szMyHost);
  #endif
-@@ -560,34 +560,30 @@ int main (argc, argv)
+@@ -560,34 +564,30 @@ int main (argc, argv)
  #ifdef HAVE_SIGACTION 
  
  static void signal_handler(int signum){
@@ -50,7 +77,7 @@ $NetBSD: patch-at,v 1.2 2003/10/05 04:25:15 taca Exp $
  
    if (SysData.Flags.pidFile)
      DelPidFile(1);
-@@ -602,7 +598,7 @@ static void signal_handler(int signum){
+@@ -602,7 +602,7 @@ static void signal_handler(int signum){
    }
  #endif
  
diff --git a/mail/yatsvrs/patches/patch-bn b/mail/yatsvrs/patches/patch-bn
new file mode 100644
index 00000000000..d39fe956943
--- /dev/null
+++ b/mail/yatsvrs/patches/patch-bn
@@ -0,0 +1,15 @@
+$NetBSD: patch-bn,v 1.1 2004/12/15 13:18:02 taca Exp $
+
+--- configure.orig	2001-12-20 16:23:50.000000000 +0900
++++ configure
+@@ -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";;
++   *)		MAIL_COMMAND="/usr/sbin/sendmail";;
++   esac
+    if test "$MAIL_COMMAND" = "no" ; then
+       { echo "configure: error: configure script cannot find sendmail. " 1>&2; exit 1; }
+    else
diff --git a/mail/yatsvrs/patches/patch-bo b/mail/yatsvrs/patches/patch-bo
new file mode 100644
index 00000000000..2f96ce6732b
--- /dev/null
+++ b/mail/yatsvrs/patches/patch-bo
@@ -0,0 +1,15 @@
+$NetBSD: patch-bo,v 1.1 2004/12/15 13:18:02 taca Exp $
+
+--- yatd/xtnd.c.orig	2001-06-04 15:43:51.000000000 +0900
++++ yatd/xtnd.c
+@@ -23,6 +23,10 @@ int FuncXtnd()
+ {
+   struct CMD_DAT * pCmd;
+ 
++  if (SysData.allow_xtnd == 0) {
++    return (*FuncNoCmd)();
++  }
++
+   ArgShift(1);
+   if (SysData.argc <= 0) {
+     ErrSetData(ERRYS_XTNDNUL, 0, NULL);
diff --git a/mail/yatsvrs/patches/patch-bp b/mail/yatsvrs/patches/patch-bp
new file mode 100644
index 00000000000..356a3fa4a60
--- /dev/null
+++ b/mail/yatsvrs/patches/patch-bp
@@ -0,0 +1,12 @@
+$NetBSD: patch-bp,v 1.1 2004/12/15 13:18:02 taca Exp $
+
+--- yatd/yatsvr.h.orig	2001-07-09 12:32:52.000000000 +0900
++++ yatd/yatsvr.h
+@@ -371,6 +371,7 @@ struct SYS_DAT {
+     unsigned  pop3AuthFail: 1;              /* pop3 authentication is failed */
+     unsigned  newByUidl    : 1;              /* determine new mail by UIDL */
+   } Flags;                  /*  flags */
++  int allow_xtnd;		/* allow XTND commands */
+ };
+ 
+ #define ERRFLG_SYSERR  BIT(0)