leafnode-1.4 -> leafnode-1.9.2

5 files changed, 56 insertions, 28 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index ae1f8d5d47a5..793c544c0335 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,17 +1,29 @@
 # New ports collection makefile for:	leafnode
-# Version required:	1.4
+# Version required:	1.9.2
 # Date created:		10 April 1996
-# Whom:			Brian Somers <brian@awfulhak.org>
+# Whom:			Brian Somers <brian@Awfulhak.org>
 #
-# $Id: Makefile,v 1.3 1997/07/04 10:06:30 brian Exp $
+# $Id: Makefile,v 1.4 1998/02/28 01:27:23 brian Exp $
 #
 
-DISTNAME=	leafnode-1.4
+DISTNAME=	leafnode-1.9.2
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.troll.no/freebies/leafnode/
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		http://www.Awfulhak.org/leafnode/
+MASTER_SITE_SUBDIR=	system/news/transport
 
-MAINTAINER=	brian@awfulhak.org
+MAINTAINER=	brian@Awfulhak.org
 
-MAN8=		leafnode.8 fetch-news.8 texpire.8 checkgroups.8
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--quiet --prefix=${PREFIX}
+MAKE_ARGS=	LOCKFILE=/var/spool/lock/news/fetch.lck \
+		LIBDIR=${PREFIX}/lib/leafnode \
+		PREFIX_VAR=${VAR}
+MAN1=		newsq.1
+MAN8=		fetch.8 applyfilter.8 leafnode.8 texpire.8 checkgroups.8
+MLINKS+=	fetch.8 fetch-news.8
+
+post-install:
+	/bin/ln -sf fetch ${PREFIX}/sbin/fetch-news
 
 .include <bsd.port.mk>
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index 92110cf1d1f6..cd7ccc9a75c9 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1 +1 @@
-MD5 (leafnode-1.4.tar.gz) = 1b937c8fb99cf21d6d282db63e846612
+MD5 (leafnode-1.9.2.tar.gz) = 3f212ce9a35f02d7259d8da9fa9cf4a1
diff --git a/news/leafnode/pkg-descr b/news/leafnode/pkg-descr
index 0c1c032a6d83..c3fc4f7f6d20 100644
--- a/news/leafnode/pkg-descr
+++ b/news/leafnode/pkg-descr
@@ -1,5 +1,4 @@
 Leafnode v1.4 is a simple NNTP server designed for small sites.
-It does NOT have NOV support.
 
 It "learns" which newsgroups should be downloaded based on what's
 accessed.
diff --git a/news/leafnode/pkg-install b/news/leafnode/pkg-install
index 8642cd42ed6b..4fdb1d1cc64e 100644
--- a/news/leafnode/pkg-install
+++ b/news/leafnode/pkg-install
@@ -1,13 +1,31 @@
-#!/bin/sh
-if [ x$2 != xPOST-INSTALL ]; then
-        exit
-fi
-SPOOLDIR=/var/spool/news
-export SPOOLDIR
-mkdir -p $SPOOLDIR
-csh -c 'mkdir -p $SPOOLDIR/{message.id,interesting.groups,out.going}'
-echo This is actually quite fast, for _small_ servers.
-csh -c 'mkdir -p $SPOOLDIR/message.id/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
-{0,1,2,3,4,5,6,7,8,9}'
-chown -R news.news $SPOOLDIR
-chmod 2750 $SPOOLDIR
+#! /bin/sh
+
+SPOOLDIR=${VAR:=/var}/spool/news
+LOCKFILE=$VAR/spool/lock/news/fetch.lck
+LIBDIR=${PREFIX:=/usr/local}/lib/leafnode
+
+mkdir -p `dirname $LOCKFILE`
+mkdir -p $SPOOLDIR $LIBDIR
+mkdir -p $SPOOLDIR/leaf.node
+mkdir -p $SPOOLDIR/message.id
+mkdir -p $SPOOLDIR/interesting.groups
+mkdir -p $SPOOLDIR/out.going
+chown news.news `dirname $LOCKFILE`
+chown news.news $SPOOLDIR $LIBDIR
+chown news.news $SPOOLDIR/leaf.node
+chown news.news $SPOOLDIR/message.id
+chown news.news $SPOOLDIR/interesting.groups
+chown news.news $SPOOLDIR/out.going
+cd $SPOOLDIR/message.id
+for a in 0 1 2 3 4 5 6 7 8 9 ; do
+	for b in 0 1 2 3 4 5 6 7 8 9 ; do
+		mkdir -p ${a}${b}0 ${a}${b}1 ${a}${b}2 \
+			${a}${b}3 ${a}${b}4 ${a}${b}5 \
+			${a}${b}6 ${a}${b}7 ${a}${b}8 \
+			${a}${b}9
+		chown news.news ${a}${b}0 ${a}${b}1 ${a}${b}2 \
+			${a}${b}3 ${a}${b}4 ${a}${b}5 \
+			${a}${b}6 ${a}${b}7 ${a}${b}8 \
+			${a}${b}9 ; \
+	done
+done
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index f7832c3f8123..84e939202a20 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -1,10 +1,9 @@
-share/doc/leafnode/COPYING
-share/doc/leafnode/INSTALL
-share/doc/leafnode/README
+bin/newsq
 lib/leafnode/config.example
-sbin/fetch-news
 sbin/leafnode
+sbin/fetch
+sbin/fetch-news
 sbin/texpire
 sbin/checkgroups
-@dirrm share/doc/leafnode
-@unexec rm -rf /var/run/news
+sbin/applyfilter
+@dirrm lib/leafnode