3 files changed, 86 insertions, 118 deletions

diff --git a/news/dnews/Makefile b/news/dnews/Makefile
index dda51b55450a..8d1981350c8f 100644
--- a/news/dnews/Makefile
+++ b/news/dnews/Makefile
@@ -3,117 +3,32 @@
 # Date created:		Thu May 29 17:16:36 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1997/08/17 10:36:44 andreas Exp $
+# $Id: Makefile,v 1.6 1997/10/04 14:53:02 andreas Exp $
 #
 
 DISTNAME=	dnews
-PKGNAME=	dnews-4.3f
+PKGNAME=	dnews-4.5i
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.netwinsite.com/pub/netwinsite/dnews/
-DISTFILES=	dnews43f_freebsd.tar.Z
+DISTFILES=	dnews45i_freebsd2.tar.Z
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-NO_CDROM=	"have to ask the company, if we are allowed to put it on CDROM"
-RESTRICTED=	"only free for non-profit organis. like schools + universities"
-NO_PACKAGE=	"we are not allowed, sorry"
-
-# dnewsweb is a cgi program that allows you to read and post news through
-# your WWW Navigator of your choice, so that you don't need a special
-# news reader. Default is, not to install dnewsweb.
-
-pre-fetch:
-.if !defined(DNEWSWEB)
-	@${ECHO} "Install with dnewsweb cgi script, that enables you to "
-	@${ECHO} "read and post news using a Web Browser of your choice"
-	@${ECHO} "by typing \"make DNEWSWEB=yes install\"."
-.else
-	@${ECHO} "Installing with dnewsweb support"
-RUN_DEPENDS=	${PREFIX}/sbin/httpd:${PORTSDIR}/www/apache
-.endif
+NO_CDROM=	"no answer yet, if we are allowed to put it onto CDROM"
+RESTRICTED=	"only free for non-profit organisations"
+NO_PACKAGE=	"${RESTRICTED}"
 
 # nothing to make, binary only
 NO_BUILD=		yes
 
-# dnews' install script installs with too restrictive permissions
-# (only rwx for the owner news) and installs unneeded stuff into 
-# the library directory, therefore I rearranged the installation:
-
-INST_PRG=${INSTALL} ${COPY} ${STRIP} -o news -g news -m 550
-INST_SCR=${INSTALL} ${COPY} -o news -g news -m 554
-INST_DAT=${INSTALL} ${COPY} -o news -g news -m 644
+# new: the dnews_setup script is the standard install program
+# it asks you questions and makes life easier for you and me
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/dnews/scripts
-	${MKDIR} ${PREFIX}/lib/dnews/doc
-		@chmod -R 0755 ${PREFIX}/lib/dnews
-		@chown -R news.news ${PREFIX}/lib/dnews
-	${MKDIR} /var/log/dnews
-		@chmod 0755 /var/log/dnews
-		@chown news.news /var/log/dnews
-	${MKDIR} /var/spool/dnews
-		@chmod 0755 /var/spool/dnews
-		@chown news.news /var/spool/dnews
-	@${ECHO_MSG} ">> Installing tellnews control program in ${PREFIX}/bin"
-	@${INSTALL_PROGRAM} ${WRKSRC}/tellnews \
-				${PREFIX}/bin
-	@${ECHO_MSG} ">> Installing runtime programs in ${PREFIX}/lib/dnews"
-	@${INST_PRG} ${WRKSRC}/dnews \
-				${PREFIX}/lib/dnews
-	@${INST_PRG} ${WRKSRC}/dnews_start \
-				${PREFIX}/lib/dnews
-	@${INST_PRG} ${WRKSRC}/dposter \
-				${PREFIX}/lib/dnews
-	@${INST_PRG} ${WRKSRC}/xmit \
-				${PREFIX}/lib/dnews
-	@${INST_DAT} ${WRKSRC}/nocached.body \
-				${PREFIX}/lib/dnews
-	@${INST_DAT} ${WRKSRC}/nocached.head \
-				${PREFIX}/lib/dnews
-	@${ECHO_MSG} ">> Installing scripts in ${PREFIX}/lib/dnews/scripts"
-	@${INST_SCR} ${WRKSRC}/newver.sh ${PREFIX}/lib/dnews/scripts
-	@${ECHO_MSG} ">> Installing config files in ${PREFIX}/lib/dnews"
-	@${INST_DAT} ${WRKSRC}/access.conf \
-				${PREFIX}/lib/dnews/access.conf.sample
-	@${INST_DAT} ${WRKSRC}/control.conf \
-				${PREFIX}/lib/dnews/control.conf.sample
-	@${INST_DAT} ${WRKSRC}/dnews.conf \
-				${PREFIX}/lib/dnews/dnews.conf.sample
-	@ln -sf ${PREFIX}/lib/dnews/dnews.conf /etc
-	@${INST_DAT} ${WRKSRC}/expire.conf \
-				${PREFIX}/lib/dnews/expire.conf.sample
-	@${INST_DAT} ${WRKSRC}/fts.conf \
-				${PREFIX}/lib/dnews/fts.conf.sample
-	@ln -sf ${PREFIX}/lib/dnews/fts.conf /var/spool/dnews/fts.conf
-	@${INST_DAT} ${WRKSRC}/hp.conf \
-				${PREFIX}/lib/dnews/hp.conf.sample
-	@${INST_DAT} ${WRKSRC}/moderators.conf \
-				${PREFIX}/lib/dnews/moderators.conf.sample
-	@${INST_DAT} ${WRKSRC}/newsfeeds.conf \
-				${PREFIX}/lib/dnews/newsfeeds.conf.sample
-	@${ECHO_MSG} ">> Installing doc files in ${PREFIX}/etc/dnews/doc"
-	@${INST_DAT} ${WRKSRC}/install.txt \
-				${PREFIX}/lib/dnews/doc
-	@${INST_DAT} ${WRKSRC}/license.txt \
-				${PREFIX}/lib/dnews/doc
-	@${INST_DAT} ${WRKSRC}/manual.txt \
-				${PREFIX}/lib/dnews/doc
-	@${INST_DAT} ${FILESDIR}/faq.html \
-				${PREFIX}/lib/dnews/doc
-	@${ECHO_MSG} ">> Installing doc files in ${PREFIX}/etc/rc.d"
-	@${INST_SCR} ${FILESDIR}/dnews.sh \
-				${PREFIX}/etc/rc.d
-.if defined(DNEWSWEB)
-	@${INSTALL_PROGRAM} ${WRKSRC}/dnewsweb ${PREFIX}/www/cgi-bin
-	@${INSTALL_DATA} ${WRKSRC}/dnewsweb.ini ${PREFIX}/www/cgi-bin
-	@${INSTALL_DATA} ${WRKSRC}/dnewsweb.txt ${PREFIX}/www/cgi-bin
-.endif
-	@${ECHO_MSG} "*** DNEWS is NOT free !!!"
-	@${ECHO_MSG} "*** Please read ${PREFIX}/lib/dnews/doc/license.txt"
-	@${ECHO_MSG} "*** Create and Edit the config files in:"
-	@${ECHO_MSG} "***      ${PREFIX}/etc/dnews"
-.if defined(DNEWSWEB)
-	@${ECHO_MSG} "***      and ${PREFIX}/www/cgi-bin/dnewsweb.ini !"
-.endif
+	@( cd ${WRKSRC}; ./dnews_setup )
+	@${ECHO_MSG} "*** DNEWS is NOT free, please read the LICENSE file !!!"
+	@${ECHO_MSG} "*** ${PREFIX}/share/doc/dnews/license.txt"
+	@${ECHO_MSG} "*** The main configuration file is:"
+	@${ECHO_MSG} "***	/etc/dnews.conf"
 
 .include <bsd.port.mk>
diff --git a/news/dnews/distinfo b/news/dnews/distinfo
index ac9020ec1948..dbd38cb702bb 100644
--- a/news/dnews/distinfo
+++ b/news/dnews/distinfo
@@ -1 +1 @@
-MD5 (dnews43f_freebsd.tar.Z) = d8e83cf151f638fcd6bbf2ba69919d95
+MD5 (dnews45i_freebsd2.tar.Z) = 36bcbb627c14087b093acf2b0c978019
diff --git a/news/dnews/pkg-plist b/news/dnews/pkg-plist
index c3822e0b0820..287d91f15eff 100644
--- a/news/dnews/pkg-plist
+++ b/news/dnews/pkg-plist
@@ -1,21 +1,74 @@
 bin/tellnews
 etc/rc.d/dnews.sh
-lib/dnews/access.conf.sample
-lib/dnews/control.conf.sample
-lib/dnews/dnews
-lib/dnews/dnews.conf.sample
-lib/dnews/dnews_start
-lib/dnews/doc/faq.html
-lib/dnews/doc/install.txt
-lib/dnews/doc/license.txt
-lib/dnews/doc/manual.txt
-lib/dnews/dposter
-lib/dnews/expire.conf.sample
-lib/dnews/fts.conf.sample
-lib/dnews/hp.conf.sample
-lib/dnews/moderators.conf.sample
-lib/dnews/newsfeeds.conf.sample
-lib/dnews/nocached.body
-lib/dnews/nocached.head
-lib/dnews/scripts/newver.sh
-lib/dnews/xmit
+dnews/access.conf
+dnews/control.conf
+dnews/dis.sh
+dnews/distrib.sh
+dnews/dmulti
+dnews/dmulti_start.sh
+dnews/dnews
+dnews/dnews.conf
+dnews/dnews.in
+dnews/dnews.lock
+dnews/dnews.log
+dnews/dnews.out
+dnews/dnews2.log
+dnews/dnews3.log
+dnews/dnews4.log
+dnews/dnews_start
+dnews/dnews_start.sh
+dnews/dnewsweb
+dnews/dnewsweb.ini
+dnews/dnewsweb.txt
+dnews/dposter
+dnews/drobot
+dnews/expire.conf
+dnews/fixinet.sh
+dnews/fixowner.sh
+dnews/fts.conf
+dnews/gupcgi
+dnews/hp.conf
+dnews/install.sh
+dnews/install.txt
+dnews/libauth.sh
+dnews/license.txt
+dnews/makelib.sh
+dnews/manual.txt
+dnews/moderators.conf
+dnews/newsfeeds.conf
+dnews/newver.sh
+dnews/resetxxx.sh
+dnews/restart.sh
+dnews/setfeed.ini
+dnews/setprot.sh
+dnews/tar.sh
+dnews/tellnews
+dnews/web/advert.htm
+dnews/web/empty.htm
+dnews/web/follow.tpl
+dnews/web/frame.htm
+dnews/web/item.htm
+dnews/web/item.tpl
+dnews/web/item_f.tpl
+dnews/web/items.htm
+dnews/web/items.tpl
+dnews/web/items3.tpl
+dnews/web/items_f.tpl
+dnews/web/items_t.tpl
+dnews/web/itemslst.tpl
+dnews/web/list.tpl
+dnews/web/post.htm
+dnews/web/post.tpl
+dnews/web/post2.tpl
+dnews/web/posted.tpl
+dnews/web/postform.tpl
+dnews/web/postit.tpl
+dnews/web/required.tpl
+dnews/web/results.tpl
+dnews/web/results2.tpl
+dnews/web/search.tpl
+dnews/web/top.tpl
+dnews/web/xresult2.tpl
+dnews/web/xresults.tpl
+dnews/web/xsearch.tpl
+dnews/xmit