Update inn stable to inn-STABLE_2_2-1999-04-08_03-01

3 files changed, 114 insertions, 100 deletions

diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 42ad830269a8..2d00e09c5a10 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.36 1999/02/23 19:33:07 andreas Exp $
+# $Id: Makefile,v 1.37 1999/02/24 23:27:16 andreas Exp $
 #
 
-DISTNAME=	inn-STABLE_2_2-1999-02-17_03-02
+DISTNAME=	inn-STABLE_2_2-1999-04-08_03-01
 PKGNAME=	inn-stable-v22
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/snapshots/
@@ -18,17 +18,25 @@ Y2K=		http://www.isc.org/inn-y2k.html
 .if defined(BATCH)
 # in BATCH mode we use the default
 NEWSSPOOL=/var/spool/news
+NEWSLIB=${PREFIX}/news
+NEWSLOG=/var/log/news
+NEWSMAN=${PREFIX}/man
+NEWSINFO=${PREFIX}/info
 .else
 # you can set this in /etc/make.conf !
 NEWSSPOOL?=/var/spool/news
+NEWSLIB?=${PREFIX}/news
+NEWSLOG?=/var/log/news
+NEWSMAN?=${PREFIX}/man
+NEWSINFO?=${PREFIX}/info
 .endif
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix=${PREFIX}/news
-CONFIGURE_ARGS+=--infodir=${PREFIX}/info
-CONFIGURE_ARGS+=--mandir=${PREFIX}/man
 CONFIGURE_ARGS+=--with-spool-dir=${NEWSSPOOL}
-CONFIGURE_ARGS+=--with-log-dir=/var/log/news
+CONFIGURE_ARGS+=--prefix=${NEWSLIB}
+CONFIGURE_ARGS+=--with-log-dir=${NEWSLOG}
+CONFIGURE_ARGS+=--mandir=${NEWSMAN}
+CONFIGURE_ARGS+=--infodir=${NEWSINFO}
 
 # tmp- and spool-dir have to live on the same filesystem, to avoid this error:
 # "rnews: cant rename /tmp/36d24c3ehN1072
@@ -46,6 +54,7 @@ CONFIGURE_ARGS+=--disable-static
 # Most available filters seem to be written in Perl these days,
 # so you can safely leave out TCL support (from the author)
 #CONFIGURE_ARGS+=--with-tcl
+
 # Do not create shared libraries
 #CONFIGURE_ARGS+=--disable-shared
 
@@ -70,12 +79,16 @@ MAN8=	actived.8 actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 \
 
 pre-extract:
 	@${ECHO} ">> building inn2 with NEWSSPOOL=${NEWSSPOOL}..."
+	@${ECHO} ">> building inn2 with NEWSLIB=${NEWSLIB}..."
+	@${ECHO} ">> building inn2 with NEWSLOG=${NEWSLOG}..."
+	@${ECHO} ">> building inn2 with NEWSMAN=${NEWSMAN}..."
+	@${ECHO} ">> building inn2 with NEWSINFO=${NEWSINFO}..."
 
 pre-install:
-	${MKDIR} ${PREFIX}/news
-	chown news.news ${PREFIX}/news
-	${MKDIR} ${NEWSSPOOL}/news
-	chown news.news ${NEWSSPOOL}
+.for dir in ${NEWSSPOOL} ${NEWSLIB} ${NEWSLOG} ${NEWSMAN} ${NEWSINFO}
+	${MKDIR} ${dir}
+	$(CHOWN} news.news ${dir}
+.endfor
 
 update: build
 	@(cd ${WRKSRC} ; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} update)
@@ -102,6 +115,6 @@ post-install:
 	${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 	# make rnews work when getting news via uucp !
-	chmod 4555 ${PREFIX}/news/bin/rnews
+	chmod 4555 ${NEWSLIB}/bin/rnews
 
 .include <bsd.port.mk>
diff --git a/news/inn-stable/distinfo b/news/inn-stable/distinfo
index f38ea451fcfa..ad65f9a7327f 100644
--- a/news/inn-stable/distinfo
+++ b/news/inn-stable/distinfo
@@ -1 +1 @@
-MD5 (inn-STABLE_2_2-1999-02-17_03-02.tar.gz) = ca0d3c748bb4289a7380702359be4120
+MD5 (inn-STABLE_2_2-1999-04-08_03-01.tar.gz) = 23fa3ffe463450b8e98eca1627d2dcf7
diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist
index 4efabd778548..941cdfc4d39a 100644
--- a/news/inn-stable/pkg-plist
+++ b/news/inn-stable/pkg-plist
@@ -1,3 +1,92 @@
+etc/rc.d/innd.sh
+man/man1/convdate.1.gz
+man/man1/getlist.1.gz
+man/man1/grephistory.1.gz
+man/man1/inews.1.gz
+man/man1/innconfval.1.gz
+man/man1/innfeed.1.gz
+man/man1/installit.1.gz
+man/man1/nntpget.1.gz
+man/man1/rnews.1.gz
+man/man1/shlock.1.gz
+man/man1/shrinkfile.1.gz
+man/man1/startinnfeed.1.gz
+man/man1/subst.1.gz
+man/man3/clientlib.3.gz
+man/man3/dbz.3.gz
+man/man3/inndcomm.3.gz
+man/man3/libinn.3.gz
+man/man3/libstorage.3.gz
+man/man3/parsedate.3.gz
+man/man3/qio.3.gz
+man/man3/wildmat.3.gz
+man/man5/active.5.gz
+man/man5/control.ctl.5.gz
+man/man5/cycbuff.conf.5.gz
+man/man5/distrib.pats.5.gz
+man/man5/expire.ctl.5.gz
+man/man5/history.5.gz
+man/man5/incoming.conf.5.gz
+man/man5/inn.conf.5.gz
+man/man5/innfeed.conf.5.gz
+man/man5/innwatch.ctl.5.gz
+man/man5/moderators.5.gz
+man/man5/motd.news.5.gz
+man/man5/newsfeeds.5.gz
+man/man5/newslog.5.gz
+man/man5/nnrp.access.5.gz
+man/man5/nnrpd.track.5.gz
+man/man5/nntpsend.ctl.5.gz
+man/man5/overview.ctl.5.gz
+man/man5/overview.fmt.5.gz
+man/man5/passwd.nntp.5.gz
+man/man5/storage.conf.5.gz
+man/man5/storage.ctl.5.gz
+man/man8/actived.8.gz
+man/man8/actsync.8.gz
+man/man8/actsyncd.8.gz
+man/man8/archive.8.gz
+man/man8/batcher.8.gz
+man/man8/buffchan.8.gz
+man/man8/cnfsstat.8.gz
+man/man8/controlchan.8.gz
+man/man8/crosspost.8.gz
+man/man8/ctlinnd.8.gz
+man/man8/cvtbatch.8.gz
+man/man8/expire.8.gz
+man/man8/expireindex.8.gz
+man/man8/expireover.8.gz
+man/man8/expirerm.8.gz
+man/man8/fastrm.8.gz
+man/man8/filechan.8.gz
+man/man8/inncheck.8.gz
+man/man8/innd.8.gz
+man/man8/inndf.8.gz
+man/man8/innreport.8.gz
+man/man8/innstat.8.gz
+man/man8/innwatch.8.gz
+man/man8/innxbatch.8.gz
+man/man8/innxmit.8.gz
+man/man8/mailpost.8.gz
+man/man8/makeactive.8.gz
+man/man8/makehistory.8.gz
+man/man8/news-recovery.8.gz
+man/man8/news.daily.8.gz
+man/man8/news2mail.8.gz
+man/man8/newslog.8.gz
+man/man8/newsrequeue.8.gz
+man/man8/nnrpd.8.gz
+man/man8/nntpsend.8.gz
+man/man8/overchan.8.gz
+man/man8/pgpverify.8.gz
+man/man8/prunehistory.8.gz
+man/man8/pullnews.8.gz
+man/man8/scanlogs.8.gz
+man/man8/send-uucp.8.gz
+man/man8/sm.8.gz
+man/man8/tally.control.8.gz
+man/man8/tally.unwanted.8.gz
+man/man8/writelog.8.gz
 news/bin/actived
 news/bin/actmerge
 news/bin/actsync
@@ -122,94 +211,6 @@ news/lib/innshellvars.pl
 news/lib/innshellvars.tcl
 news/lib/libinn.a
 news/lib/libstorage.a
-man/man1/convdate.1.gz
-man/man1/getlist.1.gz
-man/man1/grephistory.1.gz
-man/man1/inews.1.gz
-man/man1/innconfval.1.gz
-man/man1/innfeed.1.gz
-man/man1/installit.1.gz
-man/man1/nntpget.1.gz
-man/man1/rnews.1.gz
-man/man1/shlock.1.gz
-man/man1/shrinkfile.1.gz
-man/man1/startinnfeed.1.gz
-man/man1/subst.1.gz
-man/man3/clientlib.3.gz
-man/man3/dbz.3.gz
-man/man3/inndcomm.3.gz
-man/man3/libinn.3.gz
-man/man3/libstorage.3.gz
-man/man3/parsedate.3.gz
-man/man3/qio.3.gz
-man/man3/wildmat.3.gz
-man/man5/active.5.gz
-man/man5/control.ctl.5.gz
-man/man5/cycbuff.conf.5.gz
-man/man5/distrib.pats.5.gz
-man/man5/expire.ctl.5.gz
-man/man5/history.5.gz
-man/man5/incoming.conf.5.gz
-man/man5/inn.conf.5.gz
-man/man5/innfeed.conf.5.gz
-man/man5/innwatch.ctl.5.gz
-man/man5/moderators.5.gz
-man/man5/motd.news.5.gz
-man/man5/newsfeeds.5.gz
-man/man5/newslog.5.gz
-man/man5/nnrp.access.5.gz
-man/man5/nnrpd.track.5.gz
-man/man5/nntpsend.ctl.5.gz
-man/man5/overview.ctl.5.gz
-man/man5/overview.fmt.5.gz
-man/man5/passwd.nntp.5.gz
-man/man5/storage.conf.5.gz
-man/man5/storage.ctl.5.gz
-man/man8/actived.8.gz
-man/man8/actsync.8.gz
-man/man8/actsyncd.8.gz
-man/man8/archive.8.gz
-man/man8/batcher.8.gz
-man/man8/buffchan.8.gz
-man/man8/cnfsstat.8.gz
-man/man8/controlchan.8.gz
-man/man8/crosspost.8.gz
-man/man8/ctlinnd.8.gz
-man/man8/cvtbatch.8.gz
-man/man8/expire.8.gz
-man/man8/expireindex.8.gz
-man/man8/expireover.8.gz
-man/man8/expirerm.8.gz
-man/man8/fastrm.8.gz
-man/man8/filechan.8.gz
-man/man8/inncheck.8.gz
-man/man8/innd.8.gz
-man/man8/inndf.8.gz
-man/man8/innreport.8.gz
-man/man8/innstat.8.gz
-man/man8/innwatch.8.gz
-man/man8/innxbatch.8.gz
-man/man8/innxmit.8.gz
-man/man8/mailpost.8.gz
-man/man8/makeactive.8.gz
-man/man8/makehistory.8.gz
-man/man8/news-recovery.8.gz
-man/man8/news.daily.8.gz
-man/man8/news2mail.8.gz
-man/man8/newslog.8.gz
-man/man8/newsrequeue.8.gz
-man/man8/nnrpd.8.gz
-man/man8/nntpsend.8.gz
-man/man8/overchan.8.gz
-man/man8/pgpverify.8.gz
-man/man8/prunehistory.8.gz
-man/man8/pullnews.8.gz
-man/man8/scanlogs.8.gz
-man/man8/send-uucp.8.gz
-man/man8/sm.8.gz
-man/man8/tally.control.8.gz
-man/man8/tally.unwanted.8.gz
-man/man8/writelog.8.gz
 @dirrm news/bin/control
 @dirrm news/bin/filter
 @dirrm news/bin/rnews.libexec