Added new document files.

Moved config.files location.
Make keep etc/* files (by sada)

Submitted by:	Maintainer (ports-jp ML [8471])

4 files changed, 55 insertions, 37 deletions

diff --git a/japanese/mnews/Makefile b/japanese/mnews/Makefile
index 7ed456590285..f97c814650cd 100644
--- a/japanese/mnews/Makefile
+++ b/japanese/mnews/Makefile
@@ -9,7 +9,7 @@
 DISTNAME=	mnews122
 PKGNAME?=	ja-mnews-1.22
 CATEGORIES=	japanese news
-MASTER_SITES=	ftp://ftp.leo.chubu.ac.jp/pub/mnews/
+MASTER_SITES=	ftp://ftp.leo.chubu.ac.jp/pub/network/mnews/
 
 MAINTAINER=	seiken@ARGV.AC
 
@@ -17,47 +17,55 @@ WRKSRC=		${WRKDIR}/mnews-1.22/build
 MAN1=		mnews.1
 MANLANG=	ja
 
-DOCS=		FAQ.doc board.doc gnspool.doc mnews.doc prerel.doc	\
-		present.doc read1ST.doc readme.doc update.doc youbin.doc
+DOCS=		FAQ.doc IPv6.doc IPv6_en.doc board.doc gnspool.doc mnews.doc \
+		prerel.doc present.doc read1ST.doc readme.doc update.doc \
+		year2000.doc youbin.doc
 SAMPLES=	_mnews.smp jnames.fj jnames.jp jnames.smp jnames.tnn
 
 GNSPOOL?=	0
+IMPUT?=		0
 
 do-configure:
 .for f in Makefile site_dep.h
-	${SED} -e s+@PREFIX@+${PREFIX}+ -e s+@GNSPOOL@+${GNSPOOL}+ \
-		${FILESDIR}/$f.in > ${WRKSRC}/$f
+	${SED} -e s+@PREFIX@+${PREFIX}+ \
+		-e s+@GNSPOOL@+${GNSPOOL}+ \
+		-e s+@IMPUT@+${IMPUT}+ \
+		${FILESDIR}/${f}.in > ${WRKSRC}/${f}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mnews ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/lib/mnews
-	${INSTALL_DATA} ${WRKSRC}/../etc/jnames.fj ${PREFIX}/lib/mnews/jnames
+	${MKDIR} ${PREFIX}/etc/mnews
+	${INSTALL_DATA} ${WRKSRC}/../etc/jnames.fj ${PREFIX}/etc/mnews/jnames.default
+.if !exists(${PREFIX}/etc/mnews/jnames)
+	${INSTALL_DATA} ${WRKSRC}/../etc/jnames.fj ${PREFIX}/etc/mnews/jnames
+.endif
 	${MKDIR} ${PREFIX}/share/examples/mnews
 .for f in ${SAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/../etc/$f ${PREFIX}/share/examples/mnews
+	${INSTALL_DATA} ${WRKSRC}/../etc/${f} ${PREFIX}/share/examples/mnews
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/../doc/mnews.1 ${PREFIX}/man/ja/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mnews
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/../doc/$f ${PREFIX}/share/doc/mnews
+	${INSTALL_DATA} ${WRKSRC}/../doc/${f} ${PREFIX}/share/doc/mnews
 .endfor
 .endif
 
 post-install:
-.if !defined(BATCH)
-	@( \
+	@${ECHO} my.domain.com > ${PREFIX}/etc/mnews/default-domain.default
+	@if [ \! -e ${PREFIX}/etc/mnews/default-domain ]; then \
+	if [ X${BATCH} = X ]; then \
 		while [ X$$domain = X ]; do \
 			read -p "Enter the domain name of this host>" domain; \
 		done; \
-		${ECHO} $$domain > ${PREFIX}/lib/mnews/default-domain \
-	)
-.else
-	@${ECHO} "Now, you need to make sure ${PREFIX}/lib/mnews/default-domain"
-	@${ECHO} "contains correct domain name."
-	@${ECHO} my.domain.com > ${PREFIX}/lib/mnews/default-domain
-.endif
+		${ECHO} $$domain > ${PREFIX}/etc/mnews/default-domain; \
+	else \
+		${ECHO} "Now, you need to make sure ${PREFIX}/etc/mnews/default-domain"; \
+		${ECHO} "contains correct domain name."; \
+		${CP} ${PREFIX}/etc/mnews/default-domain.default ${PREFIX}/etc/mnews/default-domain; \
+	fi \
+	fi
 	@${ECHO} "Please refer to the files in:"
 	@${ECHO} "${PREFIX}/share/doc/mnews & ${PREFIX}/share/examples/mnews."
 
diff --git a/japanese/mnews/files/Makefile.in b/japanese/mnews/files/Makefile.in
index e940898d7a16..d8fb04101930 100644
--- a/japanese/mnews/files/Makefile.in
+++ b/japanese/mnews/files/Makefile.in
@@ -10,28 +10,28 @@
 
 
 
-SHELL		= /bin/sh
+SHELL		= ${SH}
 ARCH		= _386BSD
 WHEN		= date
 WHO		= whoami
 WHERE		= hostname
-CC		= /usr/bin/cc
+CC		?= cc
 LIBS		= 
 RANLIB		= ranlib
 INSTALL		= 
-CC_FLAG		= -O -DDONT_HAVE_FTIME
+CC_FLAG		= ${CFLAGS} -DDONT_HAVE_FTIME
 BIN_DIR		= @PREFIX@/bin
-LIB_DIR		= @PREFIX@/lib
+LIB_DIR		= @PREFIX@/etc
 MAN_DIR		= @PREFIX@/man/ja
 STRIP		= strip
 #  STRIP	= echo
-WITH_GNSPOOL	= @GNSPOOL@
+LOCAL_POST	= @GNSPOOL@ | @IMPUT@
 
-VERSION		= 1.21
+VERSION		= 1.22
 NET_OPT		=  -DNNTP -DNSPL -DSMTP -DMTAP -DPOP3 -DMSPL
 CONS_OPT	= -DNEWSPOST -DMAILSEND -DJNAMES -DMH -DUCBMAIL -DRMAIL -DMIME -DPAGER -DFCC
 CONF_OPT	= -DCTRL_L -DCOMPLETION -DREF_SORT -DLARGE -DDISPLAY_CTRL -DXOVER
-.if ${WITH_GNSPOOL}
+.if ${LOCAL_POST}
 CONF_OPT	+= -DLOCAL_POST
 .endif
 MOD_OPT		=
diff --git a/japanese/mnews/files/site_dep.h.in b/japanese/mnews/files/site_dep.h.in
index 71cbfb4430c0..c6c2fd72f8fa 100644
--- a/japanese/mnews/files/site_dep.h.in
+++ b/japanese/mnews/files/site_dep.h.in
@@ -3,7 +3,7 @@
  *  System      : Mini News Reader
  *  Sub system  : Site depend define
  *  File        : site_dep.h
- *  Version     : 1.21
+ *  Version     : 1.22
  *
  *  NOTE:
  *   This file made by config.sh program.
@@ -19,12 +19,12 @@
 /*
 #define	DOMAIN_NAME	"your-domain-name"
 */
-#define	DEFAULT_INIT_FILE	"@PREFIX@/lib/mnews/mnews_setup"
-#define	DOMAIN_FILE		"@PREFIX@/lib/mnews/default-domain"
-#define	NNTP_SERVER_FILE	"@PREFIX@/lib/mnews/default-server"
-#define	SMTP_SERVER_FILE	"@PREFIX@/lib/mnews/default-smtpsv"
-#define	POP3_SERVER_FILE	"@PREFIX@/lib/mnews/default-pop3sv"
-#define	YOUBIN_SERVER_FILE	"@PREFIX@/lib/mnews/default-mailsv"
+#define	DEFAULT_INIT_FILE	"@PREFIX@/etc/mnews/mnews_setup"
+#define	DOMAIN_FILE		"@PREFIX@/etc/mnews/default-domain"
+#define	NNTP_SERVER_FILE	"@PREFIX@/etc/mnews/default-server"
+#define	SMTP_SERVER_FILE	"@PREFIX@/etc/mnews/default-smtpsv"
+#define	POP3_SERVER_FILE	"@PREFIX@/etc/mnews/default-pop3sv"
+#define	YOUBIN_SERVER_FILE	"@PREFIX@/etc/mnews/default-mailsv"
 #define	ORGAN_FILE		"@PREFIX@/news/lib/organization"
 
 #define	EXT_PAGER	"@PREFIX@/bin/jless"
@@ -39,14 +39,19 @@
 #define EDITOR_COMMAND	"@PREFIX@/bin/mule -nw"
 #define	LPR_COMMAND	"lpr"
 #define	MH_COMMAND_PATH	"@PREFIX@/bin"
-#define	JNAMES_DB	"@PREFIX@/lib/jnames"
+#define	JNAMES_DB	"@PREFIX@/etc/mnews/jnames"
 #if @GNSPOOL@
 #define	SEND_COMMAND	"@PREFIX@/bin/gnmail"
 #define	POST_COMMAND	"@PREFIX@/bin/gninews"
 #define	NEWS_SPOOL	"/var/spool/gnspool"
 #else /*GNSPOOL*/
+#if @IMPUT@
+#define	SEND_COMMAND	"@PREFIX@/bin/imput"
+#define	POST_COMMAND	"@PREFIX@/bin/imput"
+#else /*IMPUT*/
 #define	SEND_COMMAND	"/usr/sbin/sendmail -t -om -oi"
 #define	POST_COMMAND	"@PREFIX@/bin/inews -h"
+#endif /*IMPUT*/
 #define	NEWS_SPOOL	"/var/spool/news"
 #endif /*GNSPOOL*/
 #define	NEWS_LIB	"@PREFIX@/news/lib"
diff --git a/japanese/mnews/pkg-plist b/japanese/mnews/pkg-plist
index f6d38dda954f..3fafa1a0d197 100644
--- a/japanese/mnews/pkg-plist
+++ b/japanese/mnews/pkg-plist
@@ -1,7 +1,11 @@
 bin/mnews
-lib/mnews/jnames
-lib/mnews/default-domain
+etc/mnews/jnames.default
+@exec test -f %B/jnames || cp %B/%f %B/jnames
+etc/mnews/default-domain.default
+@exec test -f %B/default-domain || cp %B/%f %B/default-domain
 share/doc/mnews/FAQ.doc
+share/doc/mnews/IPv6.doc
+share/doc/mnews/IPv6_en.doc
 share/doc/mnews/board.doc
 share/doc/mnews/gnspool.doc
 share/doc/mnews/mnews.doc
@@ -10,12 +14,13 @@ share/doc/mnews/present.doc
 share/doc/mnews/read1ST.doc
 share/doc/mnews/readme.doc
 share/doc/mnews/update.doc
+share/doc/mnews/year2000.doc
 share/doc/mnews/youbin.doc
 share/examples/mnews/_mnews.smp
 share/examples/mnews/jnames.fj
 share/examples/mnews/jnames.jp
 share/examples/mnews/jnames.smp
 share/examples/mnews/jnames.tnn
-@dirrm lib/mnews
-@dirrm share/doc/mnews
 @dirrm share/examples/mnews
+@dirrm share/doc/mnews
+@unexec rmdir %D/etc/mnews 2>/dev/null || true