From owner-ports-jp@jp.freebsd.org  Sat May  6 22:38:22 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA59337;
	Sat, 6 May 2000 22:38:22 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mailgw.cablecom.ne.jp (mailgw.cablecom.ne.jp [202.248.199.37])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA59330
	for <ports-jp@jp.freebsd.org>; Sat, 6 May 2000 22:38:21 +0900 (JST)
	(envelope-from sada@bsdclub.org)
Received: from srv2.cablecom.ne.jp by mailgw.cablecom.ne.jp (8.9.3/3.7W) id WAA10436; Sat, 6 May 2000 22:37:58 +0900 (JST)
Received: from localhost by srv2.cablecom.ne.jp (8.9.3/3.7W) id WAA17013; Sat, 6 May 2000 22:37:57 +0900 (JST)
To: ports-jp@jp.freebsd.org, seiken@ARGV.ORG
In-Reply-To: Your message of "Wed, 03 May 2000 04:11:17 +0900".
	<20000503041117E.sada@bsdclub.org>
From: SADA Kenji <sada@bsdclub.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
X-Mailer: mnews [version 1.22] 1999-12/19(Sun)
Message-Id: <20000506223825K.sada@bsdclub.org>
Date: Sat, 06 May 2000 22:38:25 +0900
X-Dispatcher: imput version 20000228(IM140)
Lines: 149
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 9298
Subject: [ports-jp 9298] Re: mnews is broken
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: sada@bsdclub.org

$B:4ED$G$9!#(B

In article <20000503041117E.sada@bsdclub.org>
sada@bsdclub.org writes:

>> >> $B:G6a(Bmnews$B$GEj9F$G$-$J$$$H$$$&Js9p$H%Q%C%A$r$$$?$@$-$^$7$?!#(B
>> >> 
>> >> $B;d$b3NG'$7$F$_$^$7$?!#$H$j$"$($:$3$3$KN.$7$^$9$N$G$*;H$$$NJ}$O%F%9%H$r$7(B
>> >> $B$F$$$?$@$1$l$P$H;W$$$^$9!#(B
>> 
>> $B3NG'$7$F(B checkin $B$7$^$7$?!#(B

$B$J$s$+:#3NG'$7$?$i(B check in $B$G$-$F$J$$$G$9!#$9$$$^$;$s!#(B

$B$H$3$m$GA02s$N@ZL@$5$s$N%Q%C%A$J$s$G$9$1$I!"(B
$B$^$@@_Dj$,EO$C$F$$$J$$(B (LOCAL_POST $B$,M-8z$K$J$C$F$$$J$$(B) $B$h$&$@$C$?$N$G(B
$B$5$i$K=$@5$7$F$_$^$7$?!#(B
$B$^$?!"(Bim $B$K(B Path: $B%U%#!<%k%I$,EO$k$H<u$1IU$1$F$/$l$J$+$C$?$N$G(B
$BIU$1$J$$$h$&$K$7!"$5$i$K(B ports $B$G%f!<%64D6-$N(B MNEWS_ERROR_SLEEP $B$rH?1G(B
$B$9$k$h$&$K$7$^$7$?!#(B

# $B%P!<%A%c$GCC$($?;d$NF0BV;kNO$K(B 3 $BIC$OD9$9$.$k$N$G!#(B

$BMM;R$r8+$F$$$?$@$1$k$H9,$$$G$9!#(B

--
Index: mnews/Makefile
===================================================================
RCS file: /ncvs/ports/japanese/mnews/Makefile,v
retrieving revision 1.22
diff -u -w -B -b -r1.22 Makefile
--- mnews/Makefile	2000/04/11 14:15:08	1.22
+++ mnews/Makefile	2000/05/06 13:06:14
@@ -31,13 +31,27 @@
 MAKE_ENV+=	USE_INET6=yes
 .endif
 
+.for p in GNSPOOL IMPUT
+.if defined(WITH_$p)
+$p=	1
+MAKE_ENV+=	WITH_$p=yes
+.else
+$p=	0
+.endif
+.endfor
+
+.if defined(MNEWS_ERROR_SLEEP)
+MAKE_ENV+=	ERROR_SLEEP=${MNEWS_ERROR_SLEEP}
+.endif
+
 do-configure:
-.for f in Makefile site_dep.h
+.for f in site_dep.h
 	${SED} -e s+@PREFIX@+${PREFIX}+ \
 		-e s+@GNSPOOL@+${GNSPOOL}+ \
 		-e s+@IMPUT@+${IMPUT}+ \
 		${FILESDIR}/${f}.in > ${WRKSRC}/${f}
 .endfor
+	${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mnews ${PREFIX}/bin
Index: mnews/files/Makefile.in
===================================================================
RCS file: /ncvs/ports/japanese/mnews/files/Makefile.in,v
retrieving revision 1.6
diff -u -w -B -b -r1.6 Makefile.in
--- mnews/files/Makefile.in	2000/01/09 18:00:26	1.6
+++ mnews/files/Makefile.in	2000/05/06 12:39:54
@@ -20,12 +10,10 @@
 RANLIB		= ranlib
 INSTALL		= 
 CC_FLAG		= ${CFLAGS} -DDONT_HAVE_FTIME
-BIN_DIR		= @PREFIX@/bin
-LIB_DIR		= @PREFIX@/etc
-MAN_DIR		= @PREFIX@/man/ja
+BIN_DIR		= ${PREFIX}/bin
+LIB_DIR		= ${PREFIX}/etc
+MAN_DIR		= ${PREFIX}/man/ja
 STRIP		= strip
-#  STRIP	= echo
-LOCAL_POST	= @GNSPOOL@ | @IMPUT@
 
 VERSION		= 1.22
 .ifdef (USE_INET6)
@@ -34,9 +22,12 @@
 NET_OPT		=  -DNNTP -DNSPL -DSMTP -DMTAP -DPOP3 -DMSPL
 .endif
 CONS_OPT	= -DNEWSPOST -DMAILSEND -DJNAMES -DMH -DUCBMAIL -DRMAIL -DMIME -DPAGER -DFCC
-CONF_OPT	= -DCTRL_L -DCOMPLETION -DREF_SORT -DLARGE -DDISPLAY_CTRL -DXOVER
-.if ${LOCAL_POST}
+CONF_OPT	= -DCTRL_L -DCOMPLETION -DREF_SORT -DLARGE -DDISPLAY_CTRL -DXOVER -DDONT_ADD_PATH_FIELD
+.if defined(WITH_GNSPOOL) || defined(WITH_IMPUT)
 CONF_OPT	+= -DLOCAL_POST
+.endif
+.if defined(ERROR_SLEEP)
+CONF_OPT	+= -DERROR_SLEEP=${ERROR_SLEEP}
 .endif
 MOD_OPT		=
 SRC_DIR		= ../src
Index: mnews/files/site_dep.h.in
===================================================================
RCS file: /ncvs/ports/japanese/mnews/files/site_dep.h.in,v
retrieving revision 1.7
diff -u -w -B -b -r1.7 site_dep.h.in
--- mnews/files/site_dep.h.in	2000/01/09 18:00:26	1.7
+++ mnews/files/site_dep.h.in	2000/05/06 12:51:10
@@ -46,8 +46,8 @@
 #define	NEWS_SPOOL	"/var/spool/gnspool"
 #else /*GNSPOOL*/
 #if @IMPUT@
-#define	SEND_COMMAND	"@PREFIX@/bin/imput"
-#define	POST_COMMAND	"@PREFIX@/bin/imput"
+#define	SEND_COMMAND	"@PREFIX@/bin/imput -t"
+#define	POST_COMMAND	"@PREFIX@/bin/imput -t"
 #else /*IMPUT*/
 #define	SEND_COMMAND	"/usr/sbin/sendmail -t -om -oi"
 #define	POST_COMMAND	"@PREFIX@/bin/inews -h"
Index: mnews-gnspool/Makefile
===================================================================
RCS file: /ncvs/ports/japanese/mnews-gnspool/Makefile,v
retrieving revision 1.6
diff -u -w -B -b -r1.6 Makefile
--- mnews-gnspool/Makefile	2000/04/11 14:15:09	1.6
+++ mnews-gnspool/Makefile	2000/05/03 13:11:59
@@ -12,6 +12,6 @@
 MASTERDIR=	${.CURDIR}/../mnews
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-GNSPOOL=	1
+WITH_GNSPOOL=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: mnews-im/Makefile
===================================================================
RCS file: /ncvs/ports/japanese/mnews-im/Makefile,v
retrieving revision 1.2
diff -u -w -B -b -r1.2 Makefile
--- mnews-im/Makefile	2000/04/11 14:15:11	1.2
+++ mnews-im/Makefile	2000/05/03 13:08:02
@@ -12,7 +12,6 @@
 MASTERDIR=	${.CURDIR}/../mnews
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-GNSPOOL=	0
-IMPUT=		1
+WITH_IMPUT=	yes
 
 .include "${MASTERDIR}/Makefile"
