From 8d62dc5baf885a7bf5b9e23ff9e7dcf71cff3c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 22 Mar 2001 08:40:18 +0000 Subject: [PATCH] (finally!) upgrade to 3.0-REL. --- news/diablo/Makefile | 10 +++++-- news/diablo/distinfo | 2 +- news/diablo/files/patch-ab | 12 ++++++++ news/diablo/pkg-plist | 58 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 news/diablo/files/patch-ab diff --git a/news/diablo/Makefile b/news/diablo/Makefile index d334673cd351..5b0acfae9e46 100644 --- a/news/diablo/Makefile +++ b/news/diablo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= diablo -PORTVERSION= 2.3 +PORTVERSION= 3.0 CATEGORIES= news MASTER_SITES= http://www.openusenet.org/diablo/download/ DISTNAME= ${PKGNAME}-REL @@ -17,7 +17,7 @@ MAINTAINER= des@FreeBSD.org BUILD_DEPENDS= xmake:${PORTSDIR}/devel/xmake MAN5= diablo-kp.5 diablo-files.5 -MAN8= dicmd.8 didump.8 dexpireover.8 dgrpctl.8 dclean.8 \ +MAN8= dicmd.8 didump.8 dexpireover.8 dfeedinfo.8 dgrpctl.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 @@ -28,8 +28,11 @@ post-extract: ${CP} ${SCRIPTDIR}/diablo.sh ${WRKDIR} do-configure: - ${SETENV} ${MAKE_ENV} ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKDIR}/diablo.sh ${WRKSRC}/XMakefile.inc +.ifndef WITH_DES + ${PERL} -pi -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc +.endif do-build: cd ${WRKSRC} && xmake all @@ -47,5 +50,6 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${RM} -rf ${PREFIX}/news/man .include diff --git a/news/diablo/distinfo b/news/diablo/distinfo index a228540492a0..4d4a2d92b2f8 100644 --- a/news/diablo/distinfo +++ b/news/diablo/distinfo @@ -1 +1 @@ -MD5 (diablo-2.3-REL.tgz) = a205aa77bb35a4ae53fa0cf1b9855402 +MD5 (diablo-3.0-REL.tgz) = 566c93caea8b26eea32ea0c8f398f2d4 diff --git a/news/diablo/files/patch-ab b/news/diablo/files/patch-ab new file mode 100644 index 000000000000..e94da50316b0 --- /dev/null +++ b/news/diablo/files/patch-ab @@ -0,0 +1,12 @@ +--- 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 7d32b7b31801..c25751d4f968 100644 --- a/news/diablo/pkg-plist +++ b/news/diablo/pkg-plist @@ -2,7 +2,6 @@ etc/rc.d/diablo.sh 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 @@ -10,10 +9,12 @@ news/adm/rc.news news/adm/rot news/adm/weekly.reader news/dactive.kp +news/dbin/.cvsignore news/dbin/.empty -news/dbin/dclean +news/dbin/dclient news/dbin/dexpire news/dbin/dexpireover +news/dbin/dfeedinfo news/dbin/dgrpctl news/dbin/diablo news/dbin/dicmd @@ -24,6 +25,7 @@ news/dbin/diload news/dbin/diloadfromspool news/dbin/dilookup news/dbin/dkp +news/dbin/dlockhistory news/dbin/dnewslink news/dbin/doutq news/dbin/dpath @@ -35,6 +37,7 @@ news/dbin/dreadover news/dbin/drequeue news/dbin/dspaminfo news/dbin/dspoolout +news/dbin/dstart news/dbin/dsyncgroups news/dbin/pgpverify news/dbin/plock @@ -48,12 +51,33 @@ 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 -news/samples/adm/daily.dclean news/samples/adm/daily.reader news/samples/adm/hourly.expire news/samples/adm/quadhr.expire @@ -70,8 +94,30 @@ news/samples/dnewsfeeds news/samples/dnntpspool.ctl news/samples/dreader.access news/samples/dserver.hosts +news/samples/dspool.ctl +news/samples/feeder+reader/dactive.kp +news/samples/feeder+reader/dcontrol.ctl +news/samples/feeder+reader/dexpire.ctl +news/samples/feeder+reader/diablo.config +news/samples/feeder+reader/distrib.pats +news/samples/feeder+reader/dnewsfeeds +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/diablo.config +news/samples/feeder/dnewsfeeds +news/samples/feeder/dspool.ctl news/samples/moderators news/samples/pgp-sample +news/samples/reader/dactive.kp +news/samples/reader/dcontrol.ctl +news/samples/reader/dexpire.ctl +news/samples/reader/diablo.config +news/samples/reader/distrib.pats +news/samples/reader/dreader.access +news/samples/reader/dserver.hosts +news/samples/reader/moderators share/doc/diablo/COPYRIGHT share/doc/diablo/INSTALL share/doc/diablo/README.READER @@ -83,8 +129,14 @@ share/doc/diablo/RELEASE_NOTES @dirrm news/spool/group @dirrm news/spool/cache @dirrm news/spool +@dirrm news/samples/reader +@dirrm news/samples/feeder+reader +@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