From owner-ports-jp@jp.freebsd.org  Thu Apr 22 22:38:37 1999
Received: by jaz.jp.freebsd.org (8.9.2+3.1W/8.7.3) id WAA09990;
	Thu, 22 Apr 1999 22:38:37 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from pis.toba-cmt.ac.jp (pis.toba-cmt.ac.jp [202.26.248.77])
	by jaz.jp.freebsd.org (8.9.2+3.1W/8.7.3) with ESMTP id WAA09984
	for <ports-jp@jp.freebsd.org>; Thu, 22 Apr 1999 22:38:35 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
Received: from localhost (localhost.pis [127.0.0.1])
	by pis.toba-cmt.ac.jp (8.9.3/8.8.8) with ESMTP id WAA06442
	for <ports-jp@jp.freebsd.org>; Thu, 22 Apr 1999 22:38:56 +0900 (JST)
	(envelope-from kiri@pis.toba-cmt.ac.jp)
To: ports-jp@jp.freebsd.org
In-Reply-To: Your message of "Thu, 22 Apr 1999 03:40:16 -0700 (PDT)"
	<199904221040.DAA98994@silvia.hip.berkeley.edu>
References: <199904221040.DAA98994@silvia.hip.berkeley.edu>
X-Mailer: Mew version 1.93 on XEmacs 20.4 (Emerald)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Thu_Apr_22_22:38:52_1999_41)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19990422223855A.kiri@pis.toba-cmt.ac.jp>
Date: Thu, 22 Apr 1999 22:38:55 +0900
From: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 86
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990405
X-Sequence: ports-jp 6291
Subject: [ports-jp 6291] Re: Add force BATCH mode to japanese/Wnn?
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: kiri@pis.toba-cmt.ac.jp

----Next_Part(Thu_Apr_22_22:38:52_1999_41)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B6M;3(B $B$G$9!#(B

$B$"$5$_(B $B$5$s!'(B
> .if defined(BATCH)
> BATCH=	yes	# make sure it's not empty
> .endif
> 
> $B$H$+DI2C$9$k$/$i$$$7$+;W$$$D$-$^$;$s$,(B...$B!#!J$@$5$@$5!K(B

$B$H$$$&$3$H$G$3$N!V$@$5$@$5!W$K$7$^$7$?!#59$7$1$l$P(B commit $B$7$F$$$?$@$1$l$P9,$$(B
$B$G$9!#(B $B!d(B $BED2,$5$s(B

---
KIRIYAMA Kazuhiko
kiri@pis.toba-cmt.ac.jp


----Next_Part(Thu_Apr_22_22:38:52_1999_41)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ja-Wnn-4.2-990422.diff
Content-Disposition: attachment; filename=ja-Wnn-4.2-990422.diff

diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/japanese/Wnn/Makefile ./Makefile
--- /usr/ports/current/japanese/Wnn/Makefile	Thu Feb 11 02:32:33 1999
+++ ./Makefile	Thu Apr 22 22:35:07 1999
@@ -27,7 +27,11 @@
 WNN_EXTRA_PATCH= Wnn4.2.patch-981201.tar.gz
 MAKE_ENV+=	 PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}'
 
-.if (${PKGNAME} == ja-Wnn-4.2)
+..if defined(BATCH)
+BATCH=	yes	# make sure it's not empty
+.endif
+
+if (${PKGNAME} == ja-Wnn-4.2)
 DISTFILES+=	pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-Wnn
 DOC_FROM=	${WRKSRC}/Wnn
@@ -134,7 +138,8 @@
 .endif
 
 pre-install:
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@${SETENV} BATCH=${BATCH} \
+		${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
 
 post-install:
 #### gerodic
diff -u -r -x CVS -x work -x *~ -x *.orig -N -I ^# *\$Id.*$ /usr/ports/current/japanese/Wnn/pkg/INSTALL ./pkg/INSTALL
--- /usr/ports/current/japanese/Wnn/pkg/INSTALL	Sat Mar  6 02:33:16 1999
+++ ./pkg/INSTALL	Wed Apr 21 21:32:41 1999
@@ -76,14 +76,21 @@
     # add an account 'wnn' to this system
     echo ""
     echo "You need an account 'wnn' whose ID number is 69"
-    if yesno "Would you like to create it automatically?" y; then
-	# We need a command 'pw(8)'
+    if [ -z "${BATCH}" ]; then
+	if yesno "Would you like to create it automatically?" y; then
+	    # We need a command 'pw(8)'
+	    check_pw
+	    pw useradd wnn -u 69 -g 7 -h - -d /nonexistent \
+		    -s /nonexistent -c Wnn || exit
+	else
+	    echo "Please create it, and try again."
+	    exit 1
+	fi
+    else
+	echo "Create it automatically!"
 	check_pw
 	pw useradd wnn -u 69 -g 7 -h - -d /nonexistent \
-		-s /nonexistent -c Wnn || exit
-    else
-	echo "Please create it, and try again."
-	exit 1
+	    -s /nonexistent -c Wnn || exit
     fi
     ;;
 

----Next_Part(Thu_Apr_22_22:38:52_1999_41)----
