5 files changed, 12 insertions, 74 deletions

diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index d240c4f205e7..7243adea28cd 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	diablo
-PORTVERSION=	3.0
+PORTVERSION=	4.2
 CATEGORIES=	news
 MASTER_SITES=	http://www.openusenet.org/diablo/download/
 DISTNAME=	${PKGNAME}-REL
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dominic_marks@btinternet.com
 
 BUILD_DEPENDS=	xmake:${PORTSDIR}/devel/xmake
 
@@ -27,11 +27,11 @@ MAN8=		dicmd.8 didump.8 dexpireover.8 dfeedinfo.8 dgrpctl.8 \
 DOCDIR=		${PREFIX}/share/doc/diablo
 
 post-extract:
-	${CP} ${SCRIPTDIR}/diablo.sh ${WRKDIR}
+	${CP} ${SCRIPTDIR}/diablo.sh-sample ${WRKDIR}
 
 do-configure:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKDIR}/diablo.sh ${WRKSRC}/XMakefile.inc
+		${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inc
 .ifndef WITH_DES
 	${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
 .endif
@@ -47,7 +47,7 @@ do-install:
 .for file in COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${PREFIX}/etc/rc.d
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/news/diablo/distinfo b/news/diablo/distinfo
index 4d4a2d92b2f8..95f6752af5bd 100644
--- a/news/diablo/distinfo
+++ b/news/diablo/distinfo
@@ -1 +1 @@
-MD5 (diablo-3.0-REL.tgz) = 566c93caea8b26eea32ea0c8f398f2d4
+MD5 (diablo-4.2-REL.tgz) = d948dd6fc7b63ad806c0541daf12a898
diff --git a/news/diablo/files/patch-ab b/news/diablo/files/patch-ab
deleted file mode 100644
index e94da50316b0..000000000000
--- a/news/diablo/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- XMakefile.inst.orig	Wed Mar 21 18:12:44 2001
-+++ XMakefile.inst	Wed Mar 21 18:13:49 2001
-@@ -2,8 +2,8 @@
- .set BD 
- #include "XMakefile.inc"
- 
--.set IDIRS	dbin samples samples/adm
- .set TDIRS	`find samples -type d -print | fgrep -v CVS`
-+.set IDIRS	dbin $(TDIRS)
- .set IFILES	`find $(IDIRS) \( -type f -o -type l \) -print | sort | uniq | fgrep -v CVS`
- .set TFILES	`find samples \( -type f -o -type l \) -print | fgrep -v CVS`
- .set IMAN	`find man \( -type f -o -type l \) -print | fgrep -v CVS`
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
index c25751d4f968..a762f466bd9a 100644
--- a/news/diablo/pkg-plist
+++ b/news/diablo/pkg-plist
@@ -1,13 +1,4 @@
-etc/rc.d/diablo.sh
-news/adm/biweekly.atrim
-news/adm/crontab.sample
-news/adm/daily.atrim
-news/adm/daily.reader
-news/adm/hourly.expire
-news/adm/quadhr.expire
-news/adm/rc.news
-news/adm/rot
-news/adm/weekly.reader
+etc/rc.d/diablo.sh-sample
 news/dactive.kp
 news/dbin/.cvsignore
 news/dbin/.empty
@@ -42,39 +33,18 @@ news/dbin/dsyncgroups
 news/dbin/pgpverify
 news/dbin/plock
 news/dbin/showlocks
+news/dbin/dfeedtest
+news/dbin/dhisbench
+news/dbin/doverctl
 news/dcontrol.ctl
 news/dexpire.ctl
 news/diablo.config
-news/diablo.hosts
 news/distrib.pats
 news/dnewsfeeds
-news/dnntpspool.ctl
 news/dreader.access
 news/dserver.hosts
 news/dspool.ctl
-news/feeder+reader/dactive.kp
-news/feeder+reader/dcontrol.ctl
-news/feeder+reader/dexpire.ctl
-news/feeder+reader/diablo.config
-news/feeder+reader/distrib.pats
-news/feeder+reader/dnewsfeeds
-news/feeder+reader/dreader.access
-news/feeder+reader/dserver.hosts
-news/feeder+reader/dspool.ctl
-news/feeder+reader/moderators
-news/feeder/diablo.config
-news/feeder/dnewsfeeds
-news/feeder/dspool.ctl
 news/moderators
-news/pgp-sample
-news/reader/dactive.kp
-news/reader/dcontrol.ctl
-news/reader/dexpire.ctl
-news/reader/diablo.config
-news/reader/distrib.pats
-news/reader/dreader.access
-news/reader/dserver.hosts
-news/reader/moderators
 news/samples/adm/biweekly.atrim
 news/samples/adm/crontab.sample
 news/samples/adm/daily.atrim
@@ -105,6 +75,7 @@ news/samples/feeder+reader/dreader.access
 news/samples/feeder+reader/dserver.hosts
 news/samples/feeder+reader/dspool.ctl
 news/samples/feeder+reader/moderators
+news/samples/feeder+reader/README
 news/samples/feeder/diablo.config
 news/samples/feeder/dnewsfeeds
 news/samples/feeder/dspool.ctl
@@ -124,7 +95,6 @@ share/doc/diablo/README.READER
 share/doc/diablo/README.SERVER
 share/doc/diablo/RELEASE_NOTES
 @dirrm share/doc/diablo
-@dirrm news/spool/postq
 @dirrm news/spool/news
 @dirrm news/spool/group
 @dirrm news/spool/cache
@@ -134,10 +104,7 @@ share/doc/diablo/RELEASE_NOTES
 @dirrm news/samples/feeder
 @dirrm news/samples/adm
 @dirrm news/samples
-@dirrm news/reader
-@dirrm news/feeder+reader
-@dirrm news/feeder
 @dirrm news/dqueue
 @dirrm news/dbin
-@dirrm news/adm
+@dirrm news/run
 @dirrm news
diff --git a/news/diablo/scripts/diablo.sh b/news/diablo/scripts/diablo.sh
deleted file mode 100644
index 4d00b4dd3571..000000000000
--- a/news/diablo/scripts/diablo.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-case $1 in
-start)
-	if [ -x %%PREFIX%%/news/rc.news ] ; then
-	    %%PREFIX%%/news/rc.news && echo -n ' diablo'
-	fi
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0