aboutsummaryrefslogtreecommitdiff
path: root/news/diablo
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2000-06-26 12:29:49 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2000-06-26 12:29:49 +0000
commit2815584c199334c2ff4a2b013e977e0a560b0da3 (patch)
treef98cbb5ceb07bfba891ff7d38a66fdb1986169c1 /news/diablo
parent5ba37bc87ab5d8bb2cf508fe5e661a3a01b5a782 (diff)
downloadports-2815584c199334c2ff4a2b013e977e0a560b0da3.tar.gz
ports-2815584c199334c2ff4a2b013e977e0a560b0da3.zip
Notes
Diffstat (limited to 'news/diablo')
-rw-r--r--news/diablo/Makefile66
-rw-r--r--news/diablo/distinfo2
-rw-r--r--news/diablo/files/patch-aa20
-rw-r--r--news/diablo/pkg-comment2
-rw-r--r--news/diablo/pkg-descr28
-rw-r--r--news/diablo/pkg-install25
-rw-r--r--news/diablo/pkg-message9
-rw-r--r--news/diablo/pkg-plist93
-rw-r--r--news/diablo/scripts/diablo.sh5
-rw-r--r--news/diablo/scripts/diablo.sh-sample5
10 files changed, 154 insertions, 101 deletions
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index 198c09e38a95..5902e9799027 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -6,72 +6,46 @@
#
PORTNAME= diablo
-PORTVERSION= 1.15
+PORTVERSION= 2.2
CATEGORIES= news
-MASTER_SITES= http://www.backplane.com/diablo/
-DISTNAME= ${PKGNAME}-rel
+MASTER_SITES= http://www.openusenet.org/diablo/download/
+DISTNAME= ${PKGNAME}-REL
EXTRACT_SUFX= .tgz
-MAINTAINER= jfitz@FreeBSD.org
+MAINTAINER= des@FreeBSD.org
BUILD_DEPENDS= xmake:${PORTSDIR}/devel/xmake
-WRKSRC= ${WRKDIR}/diablo
+MAN5= diablo-kp.5 diablo-files.5
+MAN8= dicmd.8 didump.8 dexpireover.8 dgrpctl.8 dclean.8 \
+ dilookup.8 diloadfromspool.8 doutq.8 dreadart.8 \
+ dreaderd.8 dpath.8 drcmd.8 dsyncgroups.8 dreadover.8 \
+ dkp.8 diablo.8 dexpire.8 dspoolout.8 dnewslink.8
-NO_PACKAGE= "has to create/verify news user"
+DOCDIR= ${PREFIX}/share/doc/diablo
-MAN5= diablo-files.5 diablo-kp.5
-MAN8= diablo.8 dclean.8 dicmd.8 dexpire.8 didump.8 \
- dilookup.8 doutq.8 dspoolout.8 dkp.8 dnewslink.8 \
- dreadart.8 dreaderd.8 dsyncgroups.8
+post-extract:
+ ${CP} ${SCRIPTDIR}/diablo.sh ${WRKDIR}
do-configure:
- ${CP} ${FILESDIR}/post-install-notes ${WRKSRC}
${SETENV} ${MAKE_ENV} ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
- ${WRKSRC}/post-install-notes
+ ${WRKDIR}/diablo.sh ${WRKSRC}/XMakefile.inc
do-build:
- cd ${WRKSRC} && ${PREFIX}/bin/xmake clean all
+ cd ${WRKSRC} && xmake all
pre-install:
- @ ${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/createuser
- ${MKDIR} ${PREFIX}/news ${PREFIX}/news/dbin ${PREFIX}/news/spool \
- ${PREFIX}/news/spool/news ${PREFIX}/share/doc/diablo
- ${RM} -f /news
- ${LN} -sf ${PREFIX}/news /news
- ${CHOWN} -R news.news ${PREFIX}/news
+ ${INSTALL} -d ${DOCDIR} ${PREFIX}/news ${PREFIX}/news/dbin
do-install:
- cd ${WRKSRC} && ${PREFIX}/bin/xmake install
+ cd ${WRKSRC} && xmake install
.for file in COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
- ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/diablo
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}
.endfor
- ${INSTALL_DATA} ${WRKSRC}/post-install-notes ${PREFIX}/share/doc/diablo
+ ${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh ${PREFIX}/etc/rc.d
post-install:
- ${INSTALL} -c -o news -g news ${WRKSRC}/samples/* ${PREFIX}/news
- @ ${ECHO} "Installing ${PREFIX}/etc/rc.d/diablo.sh startup script"
- @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "# The line to run diablo is specifically commented out" >> \
- ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "# so that you don't start up diablo with a generic config" >> \
- ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "# Once you've configured diablo, uncomment the line below" >> \
- ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "if [ -x ${PREFIX}/news/rc.news ]" >> \
- ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "# ${PREFIX}/news/rc.news && ${ECHO} -n ' diablo'" >> \
- ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} " ${ECHO} -n ' diablo(disabled)'" >> \
- ${PREFIX}/etc/rc.d/diablo.sh
- @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/diablo.sh
- ${CHMOD} 0750 ${PREFIX}/etc/rc.d/diablo.sh
-.if !defined(BATCH)
- @ /usr/bin/more -e ${PREFIX}/share/doc/diablo/post-install-notes
-.endif
+ @${CAT} ${PKGMESSAGE}
+ @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.mk>
diff --git a/news/diablo/distinfo b/news/diablo/distinfo
index 24a5a73c2255..3197af45d054 100644
--- a/news/diablo/distinfo
+++ b/news/diablo/distinfo
@@ -1 +1 @@
-MD5 (diablo-1.15-rel.tgz) = a1976d3eee802bd13e5ba5819da87fa4
+MD5 (diablo-2.2-REL.tgz) = 62b1df59b49709ebef48d336ea8cfc87
diff --git a/news/diablo/files/patch-aa b/news/diablo/files/patch-aa
new file mode 100644
index 000000000000..4ac2344dc701
--- /dev/null
+++ b/news/diablo/files/patch-aa
@@ -0,0 +1,20 @@
+--- XMakefile.inc.orig Tue Jun 20 10:31:09 2000
++++ XMakefile.inc Tue Jun 20 10:43:22 2000
+@@ -20,8 +20,8 @@
+ #endif
+
+ .set LFLAGS -L$(BD)obj -lfilter -ldiablo -lutil -lm
+-.set IDIR /news
+-.set MDIR /news/man
++.set IDIR %%PREFIX%%/news
++.set MDIR %%PREFIX%%/man
+ .set INSTALL install
+
+ #ifdef __FreeBSD__
+@@ -41,5 +41,5 @@
+ .set INSTALL /usr/ucb/install
+ #endif
+
+-.set DIST /news
++.set DIST %%PREFIX%%/news
+
diff --git a/news/diablo/pkg-comment b/news/diablo/pkg-comment
index 52454acc87fe..c570192ff5ac 100644
--- a/news/diablo/pkg-comment
+++ b/news/diablo/pkg-comment
@@ -1 +1 @@
-A news transit system for backbone news feeders
+A comprehensive newsfeeding and newsreading software package.
diff --git a/news/diablo/pkg-descr b/news/diablo/pkg-descr
index bf4b271c1c92..867d6fc08ed1 100644
--- a/news/diablo/pkg-descr
+++ b/news/diablo/pkg-descr
@@ -1,24 +1,6 @@
-DIABLO is a backbone news transit system, designed to replace INND on
-backbone machines. DIABLO UNDERSTANDS NEWSFEEDS ONLY, IT DOES NOT UNDERSTAND
-NEWSREADER CLIENTS!. You cannot run diablo on a machine which needs to
-accept nntp post commands or newsreading-related nntp commands. You cannot
-point your NNTPSERVER at a host running Diablo.
+Diablo is a comprehensive newsfeeding and newsreading software package
+that was originally developed by Matthew Dillon and is now run as an open
+source project. Diablo is significantly faster and more robust than INN,
+and scales well to multi-server installations.
-Diablo is strictly a backbone news transit system. It will accept newsfeeds
-using the ihave or the streaming check/takethis protocols, and it can
-generate newsfeeds using ihave or streaming check/takethis protocols. Diablo
-maintains a news spool and dhistory file, but the spool and history file is
-arranged very differently from INN.
-
-Diablo is also between 10 and 20 times as fast as INN in regards to incoming
-feeds, and extremely efficient for outgoing feeds. I have been running
-Diablo on BEST Internet's backbone news machine for several weeks now, and
-it has run flawlessly.
-
-If you have a dedicated newsfeeds machine which does feeds, feeds, and
-nothing but feeds, Diablo may be for you.
-
-Diablo was written and is currently being maintained by Matthew Dillon,
-you can mail me at: dillon@backplane.com
-
-WWW: http://www.backplane.com/
+WWW: http://www.openusenet.org/diablo/
diff --git a/news/diablo/pkg-install b/news/diablo/pkg-install
new file mode 100644
index 000000000000..3decfb9a7e50
--- /dev/null
+++ b/news/diablo/pkg-install
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+PKGNAME=$1
+
+case $2 in
+ PRE-INSTALL)
+ ;;
+ POST-INSTALL)
+ NEWSBASE=${PREFIX:-/usr/local}/news
+ install -d \
+ ${NEWSBASE}/dqueue \
+ ${NEWSBASE}/spool \
+ ${NEWSBASE}/spool/news \
+ ${NEWSBASE}/spool/cache \
+ ${NEWSBASE}/spool/group \
+ ${NEWSBASE}/spool/postq
+ chown -R news:news ${NEWSBASE}
+ ;;
+ *)
+ echo "Unexpected Argument $2!!!"
+ exit 1
+ ;;
+esac
+exit 0
+
diff --git a/news/diablo/pkg-message b/news/diablo/pkg-message
new file mode 100644
index 000000000000..fcc40a2a6574
--- /dev/null
+++ b/news/diablo/pkg-message
@@ -0,0 +1,9 @@
+
+Post-install notes for Diablo
+-----------------------------
+
+This port installs a very basic Diablo system. You will certainly
+want to change paths and partitions before you start using diablo in a
+production environment. Please refer to the documentation located at
+http://www.openusenet.org/diablo/ for further information.
+
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
index c4d614db11c3..7d32b7b31801 100644
--- a/news/diablo/pkg-plist
+++ b/news/diablo/pkg-plist
@@ -1,58 +1,91 @@
etc/rc.d/diablo.sh
-news/dbin/dilookup
+news/adm/biweekly.atrim
+news/adm/crontab.sample
+news/adm/daily.atrim
+news/adm/daily.dclean
+news/adm/daily.reader
+news/adm/hourly.expire
+news/adm/quadhr.expire
+news/adm/rc.news
+news/adm/rot
+news/adm/weekly.reader
+news/dactive.kp
+news/dbin/.empty
+news/dbin/dclean
+news/dbin/dexpire
+news/dbin/dexpireover
+news/dbin/dgrpctl
+news/dbin/diablo
news/dbin/dicmd
-news/dbin/didump
news/dbin/diconvhist
-news/dbin/dexpire
news/dbin/didate
-news/dbin/dspaminfo
+news/dbin/didump
news/dbin/diload
+news/dbin/diloadfromspool
+news/dbin/dilookup
+news/dbin/dkp
+news/dbin/dnewslink
news/dbin/doutq
-news/dbin/dclean
-news/dbin/dspoolout
+news/dbin/dpath
+news/dbin/dprimehostcache
+news/dbin/drcmd
news/dbin/dreadart
-news/dbin/dkp
-news/dbin/pgpverify
+news/dbin/dreaderd
+news/dbin/dreadover
+news/dbin/drequeue
+news/dbin/dspaminfo
+news/dbin/dspoolout
news/dbin/dsyncgroups
-news/dbin/dexpireover
-news/dbin/diablo
-news/dbin/dnewslink
+news/dbin/pgpverify
news/dbin/plock
news/dbin/showlocks
-news/dbin/dreaderd
-news/samples/diablo.config
-news/samples/rc.news
-news/samples/dexpire.ctl
-news/samples/dnewsfeeds
-news/samples/dnntpspool.ctl
-news/samples/diablo.hosts
-news/samples/dactive.kp
-news/samples/dreader.hosts
-news/samples/dserver.hosts
-news/samples/moderators
-news/samples/dcontrol.ctl
-news/dactive.kp
news/dcontrol.ctl
news/dexpire.ctl
news/diablo.config
news/diablo.hosts
+news/distrib.pats
news/dnewsfeeds
news/dnntpspool.ctl
-news/dreader.hosts
+news/dreader.access
news/dserver.hosts
news/moderators
-news/rc.news
+news/pgp-sample
+news/samples/adm/biweekly.atrim
+news/samples/adm/crontab.sample
+news/samples/adm/daily.atrim
+news/samples/adm/daily.dclean
+news/samples/adm/daily.reader
+news/samples/adm/hourly.expire
+news/samples/adm/quadhr.expire
+news/samples/adm/rc.news
+news/samples/adm/rot
+news/samples/adm/weekly.reader
+news/samples/dactive.kp
+news/samples/dcontrol.ctl
+news/samples/dexpire.ctl
+news/samples/diablo.config
+news/samples/diablo.hosts
+news/samples/distrib.pats
+news/samples/dnewsfeeds
+news/samples/dnntpspool.ctl
+news/samples/dreader.access
+news/samples/dserver.hosts
+news/samples/moderators
+news/samples/pgp-sample
share/doc/diablo/COPYRIGHT
share/doc/diablo/INSTALL
share/doc/diablo/README.READER
share/doc/diablo/README.SERVER
share/doc/diablo/RELEASE_NOTES
-share/doc/diablo/post-install-notes
-@unexec /bin/rm -f /news
@dirrm share/doc/diablo
-@dirrm news/dbin
-@dirrm news/dqueue
+@dirrm news/spool/postq
@dirrm news/spool/news
+@dirrm news/spool/group
+@dirrm news/spool/cache
@dirrm news/spool
+@dirrm news/samples/adm
@dirrm news/samples
+@dirrm news/dqueue
+@dirrm news/dbin
+@dirrm news/adm
@dirrm news
diff --git a/news/diablo/scripts/diablo.sh b/news/diablo/scripts/diablo.sh
new file mode 100644
index 000000000000..38f4d8bc14f3
--- /dev/null
+++ b/news/diablo/scripts/diablo.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -x %%PREFIX%%/news/rc.news ] ; then
+ %%PREFIX%%/news/rc.news && echo -n ' diablo'
+fi
diff --git a/news/diablo/scripts/diablo.sh-sample b/news/diablo/scripts/diablo.sh-sample
new file mode 100644
index 000000000000..38f4d8bc14f3
--- /dev/null
+++ b/news/diablo/scripts/diablo.sh-sample
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -x %%PREFIX%%/news/rc.news ] ; then
+ %%PREFIX%%/news/rc.news && echo -n ' diablo'
+fi