svn commit: r336846 - in head: . news/cnews news/cnews/files

Wed Dec 18 16:27:38 UTC 2013

Author: dinoex
Date: Wed Dec 18 16:27:36 2013
New Revision: 336846
URL: http://svnweb.freebsd.org/changeset/ports/336846

Log:
  - use STAGEDIR
  - use OPTIONS_DEFINE
  - honor option EXAMPLES
  - use pkg-message
  - change default path for over.view, note in UPDATING

Added:
  head/news/cnews/files/patch-cpto   (contents, props changed)
  head/news/cnews/files/patch-input-makefile   (contents, props changed)
  head/news/cnews/files/patch-mkdirs   (contents, props changed)
  head/news/cnews/files/pkg-message.in   (contents, props changed)
Modified:
  head/UPDATING
  head/news/cnews/Makefile
  head/news/cnews/pkg-plist

Modified: head/UPDATING
==============================================================================

--- head/UPDATING	Wed Dec 18 16:23:08 2013	(r336845)
+++ head/UPDATING	Wed Dec 18 16:27:36 2013	(r336846)
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20131218:
+  AFFECTS: users of news/cnews
+  AUTHOR: dinoex at FreeBSD.org
+
+  The default path for overview files has changed.
+  Rebuild your overview files after the update with:
+  su - news /usr/local/libexec/cnews/nov/initov
+
 20131217:
   AFFECTS: users of databases/ruby-bdb or ports-mgmt/portupgrade and databases/db5 or databases/db6
   AUTHOR: mandree at FreeBSD.org

Modified: head/news/cnews/Makefile
==============================================================================
--- head/news/cnews/Makefile	Wed Dec 18 16:23:08 2013	(r336845)
+++ head/news/cnews/Makefile	Wed Dec 18 16:27:36 2013	(r336846)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cnews
 PORTVERSION=	cr.g
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/c-news/ \
 		ftp://ftp.funet.fi/pub/unix/news/cnews/ \
@@ -36,13 +36,13 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
 
 USE_GCC=	any
 
 DIST_SUBDIR=	${DISTNAME}
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
+SUB_FILES=	pkg-message
 MAN1=		checknews.1cn inews.1cn postnews.1cn readnews.1cn
 MAN5=		controlperm.5 news.5 newsctl.5 newsdb.5 newsoverview.5 \
 		newssys.5
@@ -50,10 +50,14 @@ MAN8=		cnewsdo.8cn expire.8cn explode.8c
 		mkhistory.8cn newsaux.8cn newsbatch.8cn newsmail.8cn \
 		newsmaint.8cn newsoverview.8 relaynews.8cn report.8cn \
 		rnews.8cn
+NO_EG_FILES=	active.times inews organization postdefltgroup readnews.ctl \
+		readnews.help report.ctl versionname
 NEWSCTL_FILES=	active active.times batchparms controlperm explist \
 		history history.dir history.pag inews mailname mailpaths \
 		organization postdefltgroup readnews.ctl readnews.help \
 		report.ctl sys versionname whoami
+
+SUB_LIST+=	NEWSCTL=${NEWSCTL}
 PLIST_SUB+=	VARBASE=${VARBASE}
 PLIST_SUB+=	NEWSBIN=${NEWSBIN:S=^${PREFIX}/==}
 PLIST_SUB+=	NEWSCTL=${NEWSCTL:S=^${VARBASE}/==}
@@ -62,92 +66,71 @@ PLIST_SUB+=	NEWSARTS=${NEWSARTS:S=^${VAR
 PLIST_SUB+=	NEWSOV=${NEWSOV:S=^${VARBASE}/==}
 PLIST_SUB+=	NEWSCTL_FILES="${NEWSCTL_FILES}"
 
-MODIFY=		conf/quiz.def \
-		conf/substitutions \
-		include/config.make
+OPTIONS_DEFINE=	SENDMAIL
+SENDMAIL_DESC=	use sendmail instead of /bin/mail
 
 VARBASE?=	/var
 NEWSBIN?=	${PREFIX}/libexec/cnews
 NEWSCTL?=	${VARBASE}/lib/news
 NEWSARTS?=	${VARBASE}/news
-NEWSOV?=	${VARBASE}/news
+NEWSOV?=	${VARBASE}/news/over.view
 PGPVERIFY?=	pgpverify-1.12
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if make(makesum) || defined(FETCH_ALL)
 PATCHFILES+=	c-news-patch-gawk3
 .endif
 
-.if defined(WITH_SENDMAIL) || defined(WITH_CNEWS_SENDMAIL)
+.if ${PORT_OPTIONS:MSENDMAIL}
 EXTRA_PATCHES+=	${FILESDIR}/sendmail.patch
 .endif
 
 pre-patch:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY} ${WRKSRC}/${PGPVERIFY}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY} ${WRKSRC}/${PGPVERIFY}
 
 pre-configure:
-.for i in ${MODIFY}
-	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
-	${SED} \
+.for i in conf/quiz.def conf/substitutions include/config.make
+	${REINPLACE_CMD} \
 		-e "s=/usr/local/news/lib/bin/config=${NEWSBIN}/config=" \
 		-e "s=/usr/local/news/cnewsbin=${NEWSBIN}=" \
 		-e "s=/usr/local/news/lib=${NEWSCTL}=" \
 		-e "s=/var/news/over.view=${NEWSOV}=" \
 		-e "s=/var/news=${NEWSARTS}=" \
 		-e "s=/usr/local/bin=${PREFIX}/bin=" \
-		${WRKSRC}/${i}.sed > ${WRKSRC}/${i}
+		${WRKSRC}/${i}
 .endfor
 
 do-install:
-	${RM} -f ${PREFIX}/bin/inews
-	${INSTALL_DATA} ${WRKSRC}/libdbz/dbz.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/libcnews.a ${PREFIX}/lib
-	${MKDIR} ${NEWSARTS} ${NEWSOV} ${NEWSBIN} ${NEWSCTL}
-	${CHOWN} ${BINOWN}:${BINGRP} ${NEWSBIN}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PGPVERIFY} ${NEWSBIN}/pgpverify
-	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install
-	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} setup
-	cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ui readpostcheck
-.for f in checknews cnewsdo inews injnews postnews readnews
-	${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/$f
-.endfor
-	${CHOWN} news:news ${NEWSARTS} ${NEWSOV} ${NEWSCTL} ${NEWSCTL}/bin
+	${INSTALL_DATA} ${WRKSRC}/libdbz/dbz.h ${STAGEDIR}${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/libcnews.a ${STAGEDIR}${PREFIX}/lib/
+	${MKDIR} ${STAGEDIR}${NEWSARTS} ${STAGEDIR}${NEWSOV} \
+		${STAGEDIR}${NEWSCTL} ${STAGEDIR}${NEWSBIN}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PGPVERIFY} ${STAGEDIR}${NEWSBIN}/pgpverify
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/config ${STAGEDIR}${NEWSBIN}/
+	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE} install
+	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} ${MAKE_FLAGS} ${MAKEFILE} ui readpostcheck
+	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${STAGEDIR}${PREFIX}/man/man1/
+	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN5} ${STAGEDIR}${PREFIX}/man/man5/
+	cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN8} ${STAGEDIR}${PREFIX}/man/man8/
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsctl
+	cd ${WRKSRC} && ${INSTALL_DATA} ${NO_EG_FILES:S,^,*/,} \
+		${STAGEDIR}${EXAMPLESDIR}/newsctl/
+.for f in active batchparms controlperm explist mailname mailpaths sys whoami
+	cd ${WRKSRC} && ${CP} -p */${f}.eg ${STAGEDIR}${EXAMPLESDIR}/newsctl/${f}
+.endfor
+	${TOUCH} ${STAGEDIR}${EXAMPLESDIR}/newsctl/history
+	cd ${STAGEDIR}${EXAMPLESDIR}/newsctl && \
+		${STAGEDIR}${NEWSBIN}/dbz history
+.endif
 .for d in control junk news/announce/newusers news/announce news \
 	in.coming/bad in.coming out.going out.master out.nntp
-	${CHOWN} news:news ${NEWSARTS}/${d}
-.endfor
-	${CHOWN} news:news ${NEWSBIN}/input/newsspool
-	${CHMOD} 6555 ${NEWSBIN}/input/newsspool
-.for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${NEWSARTS}/${d}
 .endfor
-.for i in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man5
-.endfor
-.for i in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man8
-.endfor
-	${MKDIR} ${EXAMPLESDIR}/newsctl
-	@${TAR} -C ${NEWSCTL} -cf - . | ${TAR} -C ${EXAMPLESDIR}/newsctl -xf -
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "!!!!!!!!"
-	@${ECHO_MSG} "you MUST change the configuration of this news setup:"
-	@${ECHO_MSG} "	cd to ${NEWSCTL} and change the following files..."
-	@${ECHO_MSG} "mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup"
-	@${ECHO_MSG} "	to suit your local system and news topology."
-	@${ECHO_MSG} "check that you have vaild aliases in report.ctl,"
-	@${ECHO_MSG} "	so any problem can be reported."
-	@${ECHO_MSG} "!!!!!!!!"
-	@${ECHO_MSG} ""
-.if !defined(BATCH)
-	@if test "$$(pw usershow news)" != "news:*:8:8::0:0:News Subsystem:${NEWSCTL}:${SHELL}"; then \
-	pw usermod news -d "${NEWSCTL}" -s ${SHELL}; fi
-	@pw usershow news
-.endif
 
 test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} r)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/news/cnews/files/patch-cpto
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/cnews/files/patch-cpto	Wed Dec 18 16:27:36 2013	(r336846)
@@ -0,0 +1,11 @@
+--- conf/cpto.orig	1994-09-15 22:42:45.000000000 +0200
++++ conf/cpto	2013-12-18 11:12:51.000000000 +0100
+@@ -21,7 +21,7 @@
+ 0|1)	echo "Usage: $0 dir file ..." >&2 ; exit 2	;;
+ esac
+ 
+-dest="$1"
++dest="${DESTDIR}$1"
+ shift
+ if test ! -d "$dest"
+ then

Added: head/news/cnews/files/patch-input-makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/cnews/files/patch-input-makefile	Wed Dec 18 16:27:36 2013	(r336846)
@@ -0,0 +1,11 @@
+--- input/makefile.orig	1995-01-02 22:48:40.000000000 +0100
++++ input/makefile	2013-12-18 11:20:24.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ install:	$(PROGS)
+ 	$(MKDIR) $(DEST) $(DBIN)
+-	rm -f $(DEST)/newsspool
++	rm -f ${DESTDIR}$(DEST)/newsspool
+ 	$(TO) $(DEST) $(PROGS)
+ 	$(TO) $(RBIN) $(RCVRS)
+ 	$(TO) $(DBIN) $(DECS)

Added: head/news/cnews/files/patch-mkdirs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/cnews/files/patch-mkdirs	Wed Dec 18 16:27:36 2013	(r336846)
@@ -0,0 +1,14 @@
+--- conf/mkdirs.orig	1993-07-11 05:10:40.000000000 +0200
++++ conf/mkdirs	2013-12-18 11:18:16.000000000 +0100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ for d
+ do
+-	if test ! -d "$d"
++	if test ! -d "${DESTDIR}$d"
+ 	then
+-		mkdir "$d" || exit 1
++		mkdir "${DESTDIR}$d" || exit 1
+ 	fi
+ done
+ exit 0

Added: head/news/cnews/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/cnews/files/pkg-message.in	Wed Dec 18 16:27:36 2013	(r336846)
@@ -0,0 +1,9 @@
+you MUST change the configuration of this news setup:
+  cd to %%NEWSCTL%% and change the following files...
+mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup
+  to suit your local system and news topology.
+check that you have vaild aliases in report.ctl,
+  so any problem can be reported.
+
+for ease of administration you may add a shell:
+pw usermod news -d %%NEWSCTL%% -s /bin/csh

Modified: head/news/cnews/pkg-plist
==============================================================================
--- head/news/cnews/pkg-plist	Wed Dec 18 16:23:08 2013	(r336845)
+++ head/news/cnews/pkg-plist	Wed Dec 18 16:27:36 2013	(r336846)
@@ -1,6 +1,3 @@
- at comment Package is not complete without minimal /var/news installation :-(
- at comment Basically just in.* and out.*    /var/news might be a symbolic link
- at comment and it might not exist yet :-(
 bin/checknews
 bin/cnewsdo
 bin/inews
@@ -9,6 +6,29 @@ bin/postnews
 bin/readnews
 include/dbz.h
 lib/libcnews.a
+man/man1/checknews.1cn.gz
+man/man1/inews.1cn.gz
+man/man1/postnews.1cn.gz
+man/man1/readnews.1cn.gz
+man/man5/controlperm.5.gz
+man/man5/news.5.gz
+man/man5/newsctl.5.gz
+man/man5/newsdb.5.gz
+man/man5/newsoverview.5.gz
+man/man5/newssys.5.gz
+man/man8/cnewsdo.8cn.gz
+man/man8/expire.8cn.gz
+man/man8/explode.8cn.gz
+man/man8/mergeactive.8.gz
+man/man8/mkhistory.8cn.gz
+man/man8/newsaux.8cn.gz
+man/man8/newsbatch.8cn.gz
+man/man8/newsmail.8cn.gz
+man/man8/newsmaint.8cn.gz
+man/man8/newsoverview.8.gz
+man/man8/relaynews.8cn.gz
+man/man8/report.8cn.gz
+man/man8/rnews.8cn.gz
 %%NEWSBIN%%/batch/batchcheck
 %%NEWSBIN%%/batch/batcher
 %%NEWSBIN%%/batch/batchih
@@ -118,6 +138,8 @@ lib/libcnews.a
 %%NEWSBIN%%/unlock
 %%NEWSBIN%%/pgpverify
 %%NEWSBIN%%/config
+ at exec chown news:news %D/%%NEWSBIN%%/input/newsspool
+ at exec chmod 6555  %D/%%NEWSBIN%%/input/newsspool
 @dirrm %%NEWSBIN%%/batch
 @dirrm %%NEWSBIN%%/ctl
 @dirrm %%NEWSBIN%%/decompressors
@@ -130,53 +152,56 @@ lib/libcnews.a
 @dirrm %%NEWSBIN%%
 @owner news
 @group news
- at unexec for i in %%NEWSCTL_FILES%%; do if cmp -s %%VARBASE%%/%%NEWSCTL%%/$i %D/%%EXAMPLESDIR%%/newsctl/$i; then rm -f %%VARBASE%%/%%NEWSCTL%%/$i; else echo "Preserving %%VARBASE%%/%%NEWSCTL%%/$i"; fi; done
-%%EXAMPLESDIR%%/newsctl/active
-%%EXAMPLESDIR%%/newsctl/active.times
-%%EXAMPLESDIR%%/newsctl/batchparms
-%%EXAMPLESDIR%%/newsctl/controlperm
-%%EXAMPLESDIR%%/newsctl/explist
-%%EXAMPLESDIR%%/newsctl/history
-%%EXAMPLESDIR%%/newsctl/history.dir
-%%EXAMPLESDIR%%/newsctl/history.pag
-%%EXAMPLESDIR%%/newsctl/inews
-%%EXAMPLESDIR%%/newsctl/mailname
-%%EXAMPLESDIR%%/newsctl/mailpaths
-%%EXAMPLESDIR%%/newsctl/organization
-%%EXAMPLESDIR%%/newsctl/postdefltgroup
-%%EXAMPLESDIR%%/newsctl/readnews.ctl
-%%EXAMPLESDIR%%/newsctl/readnews.help
-%%EXAMPLESDIR%%/newsctl/report.ctl
-%%EXAMPLESDIR%%/newsctl/sys
-%%EXAMPLESDIR%%/newsctl/versionname
-%%EXAMPLESDIR%%/newsctl/whoami
- at exec mkdir -p %D/%%EXAMPLESDIR%%/newsctl/bin
- at exec mkdir -p %%VARBASE%%/%%NEWSCTL%%/bin
- at exec for i in %%NEWSCTL_FILES%%; do if test ! -f %%VARBASE%%/%%NEWSCTL%%/$i; then cp %D/%%EXAMPLESDIR%%/newsctl/$i %%VARBASE%%/%%NEWSCTL%%/$i; else echo "preservering %%VARBASE%%/%%NEWSCTL%%/$i"; fi; done
- at dirrm %%EXAMPLESDIR%%/newsctl/bin
- at dirrm %%EXAMPLESDIR%%/newsctl
- at dirrm %%EXAMPLESDIR%%
+ at exec mkdir -p %%VARBASE%%/%%NEWSCTL%%
+ at exec chown news:news %%VARBASE%%/%%NEWSCTL%%
+%%PORTEXAMPLES%%@unexec for i in %%NEWSCTL_FILES%%; do if cmp -s %%VARBASE%%/%%NEWSCTL%%/$i %D/%%EXAMPLESDIR%%/newsctl/$i; then rm -f %%VARBASE%%/%%NEWSCTL%%/$i; else echo "Preserving %%VARBASE%%/%%NEWSCTL%%/$i"; fi; done
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/active
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/active.times
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/batchparms
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/controlperm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/explist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/history
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/history.dir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/history.pag
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/inews
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/mailname
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/mailpaths
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/organization
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/postdefltgroup
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/readnews.ctl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/readnews.help
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/report.ctl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/sys
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/versionname
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsctl/whoami
+%%PORTEXAMPLES%%@exec for i in %%NEWSCTL_FILES%%; do if test ! -f %%VARBASE%%/%%NEWSCTL%%/$i; then cp -p %D/%%EXAMPLESDIR%%/newsctl/$i %%VARBASE%%/%%NEWSCTL%%/$i; else echo "preservering %%VARBASE%%/%%NEWSCTL%%/$i"; fi; done
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/newsctl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/control
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/junk
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/news/announce/newusers
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/in.coming/bad
+ at exec chmod g+w %%VARBASE%%/%%NEWSARTS%%/in.coming
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/out.going
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/out.master
+ at exec mkdir -p %%VARBASE%%/%%NEWSARTS%%/out.nntp
+ at exec chown news:news %%VARBASE%%/%%NEWSARTS%%
+ at exec chown news:news %%VARBASE%%/%%NEWSARTS%%/*
+ at exec chown news:news %%VARBASE%%/%%NEWSARTS%%/news/announce
+ at exec chown news:news %%VARBASE%%/%%NEWSARTS%%/news/announce/newusers
+ at exec mkdir -p %%VARBASE%%/%%NEWSOV%%
+ at exec chown news:news %%VARBASE%%/%%NEWSOV%%
 @cwd %%VARBASE%%
- at dirrm %%NEWSCTL%%/bin
- at dirrm %%NEWSCTL%%
- at dirrm %%NEWSCTLBASE%%
- at dirrm %%NEWSARTS%%/control
- at dirrm %%NEWSARTS%%/junk
- at dirrm %%NEWSARTS%%/news/announce/newusers
- at dirrm %%NEWSARTS%%/news/announce
- at dirrm %%NEWSARTS%%/news
- at dirrm %%NEWSARTS%%/in.coming/bad
- at dirrm %%NEWSARTS%%/in.coming
- at dirrm %%NEWSARTS%%/out.going
- at dirrm %%NEWSARTS%%/out.master
- at dirrm %%NEWSARTS%%/out.nntp
- at dirrm %%NEWSARTS%%
- at exec mkdir -p %D/%%NEWSARTS%%/control
- at exec mkdir -p %D/%%NEWSARTS%%/junk
- at exec mkdir -p %D/%%NEWSARTS%%/news/announce/newusers
- at exec mkdir -p %D/%%NEWSARTS%%/in.coming/bad
- at exec chmod g+w %D/%%NEWSARTS%%/in.coming
- at exec mkdir -p %D/%%NEWSARTS%%/out.going
- at exec mkdir -p %D/%%NEWSARTS%%/out.master
- at exec mkdir -p %D/%%NEWSARTS%%/out.nntp
- at cwd
+ at dirrmtry %%NEWSCTL%%
+ at dirrmtry %%NEWSCTLBASE%%
+ at dirrmtry %%NEWSARTS%%/control
+ at dirrmtry %%NEWSARTS%%/junk
+ at dirrmtry %%NEWSARTS%%/news/announce/newusers
+ at dirrmtry %%NEWSARTS%%/news/announce
+ at dirrmtry %%NEWSARTS%%/news
+ at dirrmtry %%NEWSARTS%%/in.coming/bad
+ at dirrmtry %%NEWSARTS%%/in.coming
+ at dirrmtry %%NEWSARTS%%/out.going
+ at dirrmtry %%NEWSARTS%%/out.master
+ at dirrmtry %%NEWSARTS%%/out.nntp
+ at dirrmtry %%NEWSARTS%%
