Use nntpclnt or inn instead of trn's own inews (so that admins only have to

configure one inews). Also use 'share' instead of 'lib'. Pointed out and
cross-checked by Kimmo Suominen <kim@tac.nyc.ny.us>.

5 files changed, 64 insertions, 105 deletions

diff --git a/news/trn/Makefile b/news/trn/Makefile
index e923a92b434..5560393caa1 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/02/16 19:07:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/03/18 19:51:31 wiz Exp $
 #
 
 DISTNAME=		trn4-test72
@@ -6,37 +6,22 @@ PKGNAME=		trn-4.72
 CATEGORIES=		news
 MASTER_SITES=		http://www.clari.net/~wayne/
 
-MAINTAINER=     	drankin@bohemians.lexington.ky.us
+MAINTAINER=     	packages@netbsd.org
 HOMEPAGE=		http://www.clari.net/~wayne/
 
-.include "../../mk/bsd.prefs.mk"
+.if defined(USE_INN) && ${USE_INN} == YES
+DEPENDS=		inn>=2.2:../inn
+.else
+DEPENDS=		nntpclnt-1.6.1:../nntpclnt
+.endif
 
-# Normally, one or more of the following variables will be set inside 
-# of /etc/mk.conf before build time.  Names of local hierarchies, e.g.
-# at, aus, or de,  or even smaller areas. Only changes a warning in
-# inews.
-TRN_LOCAL_ORG_DISTRIBUTION?=	none
-TRN_ORG_DISTRIBUTION?=		none
-TRN_CITY_DISTRIBUTION?=		none
-TRN_COUNTRY_DISTRIBUTION?=	none
-TRN_REGION_DISTRIBUTION?=	none
-TRN_CONTINENT_DISTRIBUTION?=	none
+.include "../../mk/bsd.prefs.mk"
 
 # TRN_HOSTBITS determines the number of "name segments" (x.y.z.com), counting
 # from right to left, that TRN will match to allow cancels, with 0 requiring
 # a perfect match.  For example, with TRN_HOSTBITS=3, x.y.z.com will match
 # foo.y.z.com for the purposes of allowing cancels.
-TRN_HOSTBITS?=			0
-
-#TRN_ORGANIZATION defines the value for the "Organization" header in inews.
-TRN_ORGANIZATION?=		none
-
-# The following variables must be set for proper function, but TRN does
-# not set sane default values due to the inherant dangers involved.
-.if !defined(TRN_DOMAINNAME)
-    || !defined(TRN_NNTPSERVER)
-IS_INTERACTIVE=		yes
-.endif
+TRN_HOSTBITS?=		0
 
 USE_PERL5=		yes
 
@@ -45,72 +30,31 @@ CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=		PREFIX=${PREFIX}
 CONFIGURE_ARGS=		-d -e -D bin=${PREFIX}/bin \
 		-D binexp=${PREFIX}/bin \
-		-D phost="`${CAT} ${WRKDIR}/.trn_domainname`" \
-		-D citydist=${TRN_CITY_DISTRIBUTION} \
-		-D cntrydist=${TRN_COUNTRY_DISTRIBUTION} \
-		-D contdist=${TRN_CONTINENT_DISTRIBUTION} \
-		-D filexp=${PREFIX}'/libdata/trn/filexp' \
+		-D phost=${PREFIX}'/etc/nntp/domainname' \
+		-D filexp=${PREFIX}'/share/trn/filexp' \
 		-D hostbits=${TRN_HOSTBITS} \
 		-D installbin=${PREFIX}'/bin' \
-		-D installinews=${PREFIX}'/libexec/trn/inews' \
 		-D installmansrc=${PREFIX}'/man/man1' \
-		-D installprivlib=${PREFIX}'/libdata/trn' \
+		-D installprivlib=${PREFIX}'/share/trn' \
 		-D libpth=${PREFIX}'/lib /usr/lib' \
-		-D locdist=${TRN_LOCAL_ORG_DISTRIBUTION} \
 		-D mansrc=${PREFIX}'/man/man1' \
 		-D mansrcexp=${PREFIX}'/man/man1' \
 		-D mimecap=${PREFIX}'/etc/mimecap' \
-		-D multistatedist=${TRN_REGION_DISTRIBUTION} \
-		-D orgdist=${TRN_ORG_DISTRIBUTION} \
-		-D orgname=${PREFIX}'/libdata/trn/organization' \
+		-D orgname=${PREFIX}'/etc/nntp/organization' \
 		-D perl=${PREFIX}'/bin/perl' \
 		-D perlpath=${PREFIX}'/bin/perl' \
 		-D prefix=${PREFIX} \
 		-D prefixexp=${PREFIX} \
-		-D privlib=${PREFIX}'/libdata/trn' \
-		-D privlibexp=${PREFIX}'/libdata/trn' \
-		-D servername=${PREFIX}'/libdata/trn/nntpserver' \
-		-D d_nntp -U d_local -D libs=' ' -D usevfork=false
-#		-D inews=${PREFIX}'/libexec/trn/inews' \
-#		-D useinews=${PREFIX}'/libexec/trn/inews' \
-
-pre-configure:
-	if [ "${TRN_DOMAINNAME}" = "" ]; then \
-		${ECHO} "TRN_DOMAINNAME must be set. This variable tells trn what hostname to" ;\
-		${ECHO} "place on the From: line during postings. You can:" ;\
-		${ECHO} "1.  Choose a static hostname, such as your domain (which will match" ;\
-		${ECHO} "    your sub-domain machines as well) and enter it here." ;\
-		${ECHO} "2.  Specify just the domain portion (by starting the name with a '.')" ;\
-		${ECHO} "    and your machine name will be computed at runtime and this domain" ;\
-		${ECHO} "    appended to the end." ;\
-		${ECHO} "3.  Enter just a '.' to have the machine AND domain computed at runtime." ;\
-		${ECHO} ;\
-		${ECHO} -n "Domainname: " ; \
-		read TRN_DOMAINNAME ;\
-		${ECHO} ;\
-	else \
-		TRN_DOMAINNAME=${TRN_DOMAINNAME} ; \
-	fi; \
-	${ECHO} -n $$TRN_DOMAINNAME > ${WRKDIR}/.trn_domainname
-
-pre-install:
-	@${MKDIR} ${PREFIX}/libexec/trn
+		-D privlib=${PREFIX}'/share/trn' \
+		-D privlibexp=${PREFIX}'/share/trn' \
+		-D servername=${PREFIX}'/etc/nntp/server' \
+		-D d_nntp -U d_local -D libs=' ' -D usevfork=false \
+		-D inews=${PREFIX}'/bin/inews' \
+		-D useinews=${PREFIX}'/bin/inews'
 
 post-install:
-	@if [ "${TRN_NNTPSERVER}" = "" ]; then \
-		${ECHO} "TRN_NNTPSERVER must be set. This variable tells trn what hostname to" ;\
-		${ECHO} "use as the initial default NNTP server. After installation, this" ;\
-		${ECHO} "value can be changed by editing ${PREFIX}/libdata/trn/nntpserver" ;\
-		${ECHO} ;\
-		${ECHO} -n "NNTP server: " ; \
-		read TRN_NNTPSERVER ; \
-		${ECHO} ;\
-	else \
-		TRN_NNTPSERVER=${TRN_NNTPSERVER} ; \
-	fi; \
-	${ECHO} $$TRN_NNTPSERVER > ${PREFIX}/libdata/trn/nntpserver
-	@${ECHO} ${TRN_ORGANIZATION} > ${PREFIX}/libdata/trn/organization
-	@${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 ${PREFIX}/man/man1/rn.1.gz
+	@${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 \
+		${PREFIX}/man/man1/rn.1.gz
 	@${LN} -s trn ${PREFIX}/bin/rn
 	@${LN} -s trn.1 ${PREFIX}/man/man1/rn.1
 
diff --git a/news/trn/files/patch-sum b/news/trn/files/patch-sum
index 2d3d6545765..6de6b502bf4 100644
--- a/news/trn/files/patch-sum
+++ b/news/trn/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/02/16 18:47:16 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/18 19:51:33 wiz Exp $
 
-MD5 (patch-ac) = 29ca1953a8a6f84ee00035c8508bd4af
+MD5 (patch-ac) = c6dcdb2b80ab877bbc88956be2f98b39
+MD5 (patch-ad) = d8770a6bbe8b88c4f06af82612f9929a
diff --git a/news/trn/patches/patch-ac b/news/trn/patches/patch-ac
index c2cb1798bed..81a770c1d02 100644
--- a/news/trn/patches/patch-ac
+++ b/news/trn/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2000/02/16 18:47:17 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2000/03/18 19:51:33 wiz Exp $
 
 --- Configure.orig	Mon Sep 21 00:50:59 1998
 +++ Configure	Sun Jan 16 06:50:36 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1 2000/02/16 18:47:17 wiz Exp $
      ;;
  *)  case "$d_inews" in
 -    '') dflt="$prefix/bin";;
-+    '') dflt="$prefix/libexec/trn";;
++    '') dflt=none;;
      "$define")
  	set dflt installinews bin
  	eval $prefixit
diff --git a/news/trn/patches/patch-ad b/news/trn/patches/patch-ad
new file mode 100644
index 00000000000..0ed9c7b145b
--- /dev/null
+++ b/news/trn/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2000/03/18 19:51:33 wiz Exp $
+
+--- Pnews.SH.orig	Sun Jan 17 20:01:22 1999
++++ Pnews.SH	Sat Mar 18 13:47:13 2000
+@@ -911,7 +911,12 @@
+ esac
+ 
+ case $orgname in
+-/*) orgname=`$cat $orgname` ;;
++/*) if $test -r $orgname; then
++	orgname=`$cat $orgname`
++    else
++	orgname=""
++    fi
++    ;;
+ esac
+ 
+ $sed -e '/^Reply-To: $/d' > $tmpart <<EOHeader
diff --git a/news/trn/pkg/PLIST b/news/trn/pkg/PLIST
index 4a436e07742..3d41188d587 100644
--- a/news/trn/pkg/PLIST
+++ b/news/trn/pkg/PLIST
@@ -1,33 +1,29 @@
-@comment $NetBSD: PLIST,v 1.2 2000/02/16 18:47:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/03/18 19:51:34 wiz Exp $
 bin/Pnews
 bin/Rnmail
 bin/nntplist
 bin/rn
 bin/trn
 bin/trn-artchk
-libdata/trn/INIT
-libdata/trn/Pnews.header
-libdata/trn/Speller
-libdata/trn/filexp
-libdata/trn/makedir
-libdata/trn/mbox.saver
-libdata/trn/newsnews
-libdata/trn/norm.saver
-libdata/trn/nntpserver
-libdata/trn/organization
-libdata/trn/access.def
-libdata/trn/HelpFiles/changelog
-libdata/trn/HelpFiles/hints
-libdata/trn/HelpFiles/quickstart
-libdata/trn/HelpFiles/top
-libdata/trn/HelpFiles/samples/access
-libdata/trn/HelpFiles/samples/index
-libdata/trn/HelpFiles/samples/trnrc
-@dirrm libdata/trn/HelpFiles/samples
-@dirrm libdata/trn/HelpFiles
-@dirrm libdata/trn
-libexec/trn/inews
-@dirrm libexec/trn
+share/trn/INIT
+share/trn/Pnews.header
+share/trn/Speller
+share/trn/filexp
+share/trn/makedir
+share/trn/mbox.saver
+share/trn/newsnews
+share/trn/norm.saver
+share/trn/access.def
+share/trn/HelpFiles/changelog
+share/trn/HelpFiles/hints
+share/trn/HelpFiles/quickstart
+share/trn/HelpFiles/top
+share/trn/HelpFiles/samples/access
+share/trn/HelpFiles/samples/index
+share/trn/HelpFiles/samples/trnrc
+@dirrm share/trn/HelpFiles/samples
+@dirrm share/trn/HelpFiles
+@dirrm share/trn
 man/man1/Pnews.1
 man/man1/Rnmail.1
 man/man1/rn.1