Date: Sat, 18 May 2002 13:35:56 +0100 (BST) From: Dominic Marks <dominic_marks@btinternet.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38242: Port update: news/diablo Message-ID: <20020518123556.D666C105@host217-41-15-143.in-addr.btopenworld.com>
next in thread | raw e-mail | index | archive | help
>Number: 38242 >Category: ports >Synopsis: Port update: news/diablo >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat May 18 05:40:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Dominic Marks >Release: FreeBSD 4.6-RC i386 >Organization: Student >Environment: System: FreeBSD gallium 4.6-RC FreeBSD 4.6-RC #4: Thu May 16 22:38:19 BST 2002 dom@gallium:/usr/obj/usr/src/sys/GALLIUM i386 >Description: Port update: Diablo 3.0 -> 4.1 1. Major version update 2. Use sed instead of perl for PREFIX handling 3. Fixed distinfo / plist 4. patch-ab removed 5. diablo.sh renamed to diablo.sh.sample 6. Auto-creation of user/group if needed 7. Claim maintainership from ports@ Other minor related changes. >How-To-Repeat: NA. >Fix: ? scripts/diablo.sh.sample Index: Makefile =================================================================== RCS file: /home/ncvs/ports/news/diablo/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 2002/02/08 10:44:10 1.15 +++ Makefile 2002/05/18 12:16:42 @@ -6,13 +6,13 @@ # PORTNAME= diablo -PORTVERSION= 3.0 +PORTVERSION= 4.1 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 @@ -22,30 +22,39 @@ dreaderd.8 dpath.8 drcmd.8 dsyncgroups.8 dreadover.8 \ dkp.8 diablo.8 dexpire.8 dspoolout.8 dnewslink.8 +NEWSDIR= ${PREFIX}/news DOCDIR= ${PREFIX}/share/doc/diablo +RC_FILE= ${WRKDIR}/diablo.sh.sample +MAKE_FILE= ${WRKSRC}/XMakefile.inc post-extract: - ${CP} ${SCRIPTDIR}/diablo.sh ${WRKDIR} + ${CP} ${SCRIPTDIR}/diablo.sh.sample ${WRKDIR} do-configure: - ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKDIR}/diablo.sh ${WRKSRC}/XMakefile.inc + ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${RC_FILE} > ${RC_FILE}.temp + ${MV} ${RC_FILE}.temp ${RC_FILE} .ifndef WITH_DES - ${PERL} -pi -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc + ${SED} -e 's,-ldes ,,g' ${MAKE_FILE} > ${MAKE_FILE}.temp + ${MV} ${MAKE_FILE}.temp ${MAKE_FILE} .endif + ${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${MAKE_FILE} > ${MAKE_FILE}.temp + ${MV} ${MAKE_FILE}.temp ${MAKE_FILE} do-build: cd ${WRKSRC} && xmake all pre-install: - ${INSTALL} -d ${DOCDIR} ${PREFIX}/news ${PREFIX}/news/dbin + ${INSTALL} -d ${DOCDIR} ${NEWSDIR} ${NEWSDIR}/dbin do-install: cd ${WRKSRC} && xmake install -.for file in COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR} +.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} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/news/diablo/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 2001/03/22 08:40:17 1.6 +++ distinfo 2002/05/18 12:16:42 @@ -1 +1 @@ -MD5 (diablo-3.0-REL.tgz) = 566c93caea8b26eea32ea0c8f398f2d4 +MD5 (diablo-4.1-REL.tgz) = 813df410630d0e6aec6dde164af272d8 Index: pkg-install =================================================================== RCS file: /home/ncvs/ports/news/diablo/pkg-install,v retrieving revision 1.1 diff -u -r1.1 pkg-install --- pkg-install 2000/06/26 12:29:48 1.1 +++ pkg-install 2002/05/18 12:16:42 @@ -2,6 +2,9 @@ PKGNAME=$1 +USER="news" +GROUP="news" + case $2 in PRE-INSTALL) ;; @@ -14,7 +17,32 @@ ${NEWSBASE}/spool/cache \ ${NEWSBASE}/spool/group \ ${NEWSBASE}/spool/postq - chown -R news:news ${NEWSBASE} + # FreeBSD has a news user and group by default, so why have this? + # Well, relying on the state of master.passwd today isn't sensible, + # it may change. So we check if there is a news user and group + # already present and if not we add one. The port should therefore + # keep working despite any changes to master.passwd that may, or may + # not occur in the future + if ! pw groupshow "${GROUP}" 2> /dev/null 1>&2; then + if pw groupadd ${GROUP}; then + echo "Added group: \"${GROUP}.\"" + else + echo "Add group \"${GROUP}\" failed!" + exit 1 + fi + fi + if ! pw usershow "${USER}" 2> /dev/null 1>&2; then + if pw useradd ${USER} -g ${GROUP} -h - \ + -s "/sbin/nologin" -d "/nonexistant" \ + -c "News Subsystem"; + then + echo "Added user \"${USER}\"." + else + echo "Add user \"${USER}\" failed!" + exit 1 + fi + fi + chown -R ${USER}:${GROUP} ${NEWSBASE} ;; *) echo "Unexpected Argument $2!!!" Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/news/diablo/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 2001/03/22 08:40:17 1.6 +++ pkg-plist 2002/05/18 12:16:42 @@ -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,19 @@ 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/samples/feeder+reader/README 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 @@ -134,10 +105,7 @@ @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 <how to correct or work around the problem, if known (multiple lines) >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?20020518123556.D666C105>