Date: Wed, 24 Apr 2002 08:34:28 -0700 (PDT) From: Hendrik Scholz <hendrik@scholz.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/37422: port upgrade news/diablo 3.0 -> 4.1 Message-ID: <200204241534.g3OFYSq52658@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 37422 >Category: ports >Synopsis: port upgrade news/diablo 3.0 -> 4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Apr 24 08:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Hendrik Scholz >Release: 5.0 -current x86 >Organization: NetUSE AG >Environment: FreeBSD deimos.raisdorf.net 5.0-CURRENT FreeBSD 5.0-CURRENT #6: Sun Mar 17 19:26:49 EST 2002 hscholz@deimos.raisdorf.net:/usr/src/sys/i386/compile/DEIMOS5 i386 >Description: This is an update for the diablo news server. patch-aa and patch-ab is a workaround for -current. I had problems using xmake without having an output in xmake. This problem seem not to exist on 4.5 (only -RC tested). If you leave out patch-aa and patch-ab xmake will segfault when doing make clean or complaining about backticks. I will investigate this further and send another bug report. The diablo shar can be downloaded from http://www.raisdorf.net/files/FreeBSD/ >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # diablo # diablo/files # diablo/files/patch-aa # diablo/files/patch-ab # diablo/files/patch-ac # diablo/files/patch-ad # diablo/scripts # diablo/scripts/diablo.sh # diablo/Makefile # diablo/distinfo # diablo/pkg-comment # diablo/pkg-descr # diablo/pkg-message # diablo/pkg-plist # echo c - diablo mkdir -p diablo > /dev/null 2>&1 echo c - diablo/files mkdir -p diablo/files > /dev/null 2>&1 echo x - diablo/files/patch-aa sed 's/^X//' >diablo/files/patch-aa << 'END-of-diablo/files/patch-aa' X--- lib/XMakefile Fri Dec 14 03:23:28 2001 X+++ lib/XMakefile Wed Apr 24 15:32:34 2002 X@@ -30,4 +30,4 @@ X X clean: X rm -f $(OBJS) $(DLIB) $(PROTOS) X- X+ // X--- filter/XMakefile Mon Oct 12 12:33:35 1998 X+++ filter/XMakefile Wed Apr 24 15:55:45 2002 X@@ -14,6 +14,7 @@ X ar cr %(left).new %(right) X ranlib %(left).new X mv -f %(left).new %(left) X+ // X X $(OBJS) : $(SRCS) X $(CC) $(CFLAGS) %(right) -o %(left) -c X@@ -24,4 +25,4 @@ X X clean: X rm -f $(OBJS) $(FLIB) $(PROTOS) X- X+ // X--- sup/XMakefile Mon Oct 12 12:33:35 1998 X+++ sup/XMakefile Wed Apr 24 15:53:30 2002 X@@ -16,4 +16,4 @@ X X clean: X rm -f $(OBJS) $(LPROGS) X- X+ // END-of-diablo/files/patch-aa echo x - diablo/files/patch-ab sed 's/^X//' >diablo/files/patch-ab << 'END-of-diablo/files/patch-ab' X--- dreaderd/XMakefile Tue Sep 18 02:52:16 2001 X+++ dreaderd/XMakefile Wed Apr 24 23:01:04 2002 X@@ -13,6 +13,7 @@ X .set PROTOS $(BD)obj/dreaderd-protos.h X X all: $(PROTOS) $(PROG) $(RLIB) X+ // X X $(PROG) : $(OBJS) X $(CC) $(CFLAGS) %(right) -o %(left) $(LFLAGS) END-of-diablo/files/patch-ab echo x - diablo/files/patch-ac sed 's/^X//' >diablo/files/patch-ac << 'END-of-diablo/files/patch-ac' X--- XMakefile.inc Tue Feb 5 07:56:11 2002 X+++ XMakefile.inc Wed Apr 24 23:04:39 2002 X@@ -21,8 +21,8 @@ X #endif X X .set LFLAGS -L$(BD)obj -lfilter -ldiablo -lutil -lm X-.set IDIR /news X-.set MDIR /news/man X+.set IDIR %%NEWS_PREFIX%% X+.set MDIR %%PREFIX%%/man X .set INSTALL install X X /* X@@ -61,5 +61,5 @@ X .set INSTALL /usr/ucb/install X #endif X X-.set DIST /news X+.set DIST %%NEWS_PREFIX%% X END-of-diablo/files/patch-ac echo x - diablo/files/patch-ad sed 's/^X//' >diablo/files/patch-ad << 'END-of-diablo/files/patch-ad' X--- XMakefile.inst.orig Thu Oct 25 19:18:40 2001 X+++ XMakefile.inst Wed Apr 24 23:58:55 2002 X@@ -4,14 +4,14 @@ X X .set IDIRS dbin samples samples/adm samples/feeder \ X samples/feeder+reader samples/reader X-.set IFILES `find $(IDIRS) \( -type f -o -type l \) -print | sort | uniq | fgrep -v CVS` X+.set IFILES `find $(IDIRS) \( -type f -o -type l \) -print | sort | uniq | grep -v -e CVS -e .cvsignore -e .empty` X .set TFILES samples/dactive.kp samples/dcontrol.ctl samples/dexpire.ctl \ X samples/diablo.config samples/distrib.pats samples/dnewsfeeds \ X samples/dreader.access samples/dserver.hosts \ X samples/dspool.ctl samples/moderators X .set IMAN `find man \( -type f -o -type l \) -print | fgrep -v CVS` X .set MDIRS dqueue spool spool/news spool/group spool/cache X-.set ODIRS man man/man5 man/man8 run X+.set ODIRS run X X .set DDIRS $(IDIRS:"*":"$(IDIR)/*") X .set DMDIRS $(MDIRS:"*":"$(IDIR)/*") END-of-diablo/files/patch-ad echo c - diablo/scripts mkdir -p diablo/scripts > /dev/null 2>&1 echo x - diablo/scripts/diablo.sh sed 's/^X//' >diablo/scripts/diablo.sh << 'END-of-diablo/scripts/diablo.sh' X#!/bin/sh X Xcase $1 in Xstart) X if [ -x %%NEWS_PREFIX%%/news/rc.news ] ; then X %%NEWS_PREFIX%%/news/rc.news && echo -n ' diablo' X fi X ;; Xstop) X ;; X*) X echo "Usage: `basename $0` {start|stop}" >&2 X exit 64 X ;; Xesac X Xexit 0 END-of-diablo/scripts/diablo.sh echo x - diablo/Makefile sed 's/^X//' >diablo/Makefile << 'END-of-diablo/Makefile' X# New ports collection makefile for: diablo X# Date created: June 2nd 1997 X# Whom: jfitz X# X# $FreeBSD$ X# X XPORTNAME= diablo XPORTVERSION= 4.1 XCATEGORIES= news XMASTER_SITES= http://www.openusenet.org/diablo/download/ XDISTNAME= ${PKGNAME}-REL XEXTRACT_SUFX= .tgz X XMAINTAINER= hendrik@scholz.net X XBUILD_DEPENDS= xmake:${PORTSDIR}/devel/xmake X XMAN5= diablo-files.5 diablo-kp.5 XMAN8= dexpire.8 dexpireover.8 dfeedinfo.8 dgrpctl.8 diablo.8 dicmd.8 \ X didump.8 diloadfromspool.8 dilookup.8 dkp.8 dnewslink.8 doutq.8 \ X doverctl.8 dpath.8 drcmd.8 dreadart.8 dreaderd.8 dreadover.8 \ X drequeue.8 dspoolout.8 dsyncgroups.8 X X.if !defined(NEWS_PREFIX) XNEWS_PREFIX=${PREFIX}/news X.endif X XPLIST_SUB= NEWS_PREFIX=${NEWS_PREFIX} X Xpre-everything:: X @${ECHO} "" X @${ECHO} "You may use the following build options:" X @${ECHO} "" X @${ECHO} " NEWS_PREFIX=/news Set another installation dir for the main programs." X @${ECHO} " manpages will still be installed to ${PREFIX}/man" X @${ECHO} "" X Xpost-extract: X ${CP} ${SCRIPTDIR}/diablo.sh ${WRKDIR} X Xdo-configure: X ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ X ${WRKDIR}/diablo.sh ${WRKSRC}/XMakefile.inc X ${PERL} -pi -e 's|%%NEWS_PREFIX%%|${NEWS_PREFIX}|g' \ X ${WRKDIR}/diablo.sh ${WRKSRC}/XMakefile.inc X.ifndef WITH_DES X ${PERL} -pi -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc X.endif X Xdo-build: X cd ${WRKSRC} && xmake all X Xdo-install: X ${MKDIR} ${NEWS_PREFIX} X cd ${WRKSRC} && xmake install X.for file in COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES X ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR} X.endfor X ${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh ${PREFIX}/etc/rc.d X Xpost-install: X @${CAT} ${PKGMESSAGE} X @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL X X.include <bsd.port.mk> END-of-diablo/Makefile echo x - diablo/distinfo sed 's/^X//' >diablo/distinfo << 'END-of-diablo/distinfo' XMD5 (diablo-4.1-REL.tgz) = 813df410630d0e6aec6dde164af272d8 END-of-diablo/distinfo echo x - diablo/pkg-comment sed 's/^X//' >diablo/pkg-comment << 'END-of-diablo/pkg-comment' XA comprehensive newsfeeding and newsreading software package END-of-diablo/pkg-comment echo x - diablo/pkg-descr sed 's/^X//' >diablo/pkg-descr << 'END-of-diablo/pkg-descr' XDiablo is a comprehensive newsfeeding and newsreading software package Xthat was originally developed by Matthew Dillon and is now run as an open Xsource project. Diablo is significantly faster and more robust than INN, Xand scales well to multi-server installations. X XWWW: http://www.openusenet.org/diablo/ END-of-diablo/pkg-descr echo x - diablo/pkg-message sed 's/^X//' >diablo/pkg-message << 'END-of-diablo/pkg-message' X XPost-install notes for Diablo X----------------------------- X XThis port installs a very basic Diablo system. You will certainly Xwant to change paths and partitions before you start using diablo in a Xproduction environment. Please refer to the documentation located at Xhttp://www.openusenet.org/diablo/ for further information. X END-of-diablo/pkg-message echo x - diablo/pkg-plist sed 's/^X//' >diablo/pkg-plist << 'END-of-diablo/pkg-plist' Xetc/rc.d/diablo.sh X@cwd %%NEWS_PREFIX%% Xdactive.kp Xdbin/diloadfromspool Xdbin/dclient Xdbin/dexpire Xdbin/dexpireover Xdbin/dfeedinfo Xdbin/dfeedtest Xdbin/dgrpctl Xdbin/dhisbench Xdbin/diablo Xdbin/dicmd Xdbin/diconvhist Xdbin/didate Xdbin/didump Xdbin/diload Xdbin/dlockhistory Xdbin/dilookup Xdbin/dkp Xdbin/dprimehostcache Xdbin/dnewslink Xdbin/doutq Xdbin/doverctl Xdbin/dpath Xdbin/drcmd Xdbin/dreadart Xdbin/dreaderd Xdbin/dreadover Xdbin/drequeue Xdbin/dspaminfo Xdbin/dspoolout Xdbin/dstart Xdbin/dsyncgroups Xdbin/pgpverify Xdbin/plock Xdbin/showlocks Xdcontrol.ctl Xdexpire.ctl Xdiablo.config Xdistrib.pats Xdnewsfeeds Xdreader.access Xdserver.hosts Xdspool.ctl Xmoderators Xsamples/adm/rot Xsamples/adm/biweekly.atrim Xsamples/adm/crontab.sample Xsamples/adm/daily.atrim Xsamples/adm/daily.reader Xsamples/adm/hourly.expire Xsamples/adm/quadhr.expire Xsamples/adm/rc.news Xsamples/adm/weekly.reader Xsamples/feeder/diablo.config Xsamples/feeder/dnewsfeeds Xsamples/feeder/dspool.ctl Xsamples/feeder+reader/dactive.kp Xsamples/feeder+reader/README Xsamples/feeder+reader/dcontrol.ctl Xsamples/feeder+reader/dexpire.ctl Xsamples/feeder+reader/diablo.config Xsamples/feeder+reader/distrib.pats Xsamples/feeder+reader/dnewsfeeds Xsamples/feeder+reader/dreader.access Xsamples/feeder+reader/dserver.hosts Xsamples/feeder+reader/dspool.ctl Xsamples/feeder+reader/moderators Xsamples/reader/dcontrol.ctl Xsamples/reader/dactive.kp Xsamples/reader/diablo.config Xsamples/reader/dexpire.ctl Xsamples/reader/distrib.pats Xsamples/reader/dreader.access Xsamples/reader/dserver.hosts Xsamples/reader/moderators Xsamples/dcontrol.ctl Xsamples/dactive.kp Xsamples/diablo.config Xsamples/dexpire.ctl Xsamples/diablo.hosts Xsamples/distrib.pats Xsamples/dnewsfeeds Xsamples/dnntpspool.ctl Xsamples/dreader.access Xsamples/dserver.hosts Xsamples/dspool.ctl Xsamples/moderators Xsamples/pgp-sample X@dirrm dbin X@dirrm dqueue X@dirrm run X@dirrm samples/adm X@dirrm samples/feeder X@dirrm samples/feeder+reader X@dirrm samples/reader X@dirrm samples X@dirrm spool/news X@dirrm spool/group X@dirrm spool/cache X@dirrm spool X@cwd / X@dirrm %%NEWS_PREFIX%% END-of-diablo/pkg-plist exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204241534.g3OFYSq52658>