Index: head/news/noffle/Makefile
===================================================================
--- head/news/noffle/Makefile	(revision 370405)
+++ head/news/noffle/Makefile	(revision 370406)
@@ -1,51 +1,57 @@
 # Created by: Kirill Ponomarew <ponomarew@oberon.net>
 # $FreeBSD$
 
 PORTNAME=	noffle
 PORTVERSION=	1.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28devel%29/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	News server for low speed dial-up connections
 
 LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-configfile=${LOCALBASE}/etc/noffle.conf \
 		--with-usersfile=${LOCALBASE}/etc/noffle.users
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 SPOOL_DIR=	/var/spool/noffle
 PLIST_SUB+=	SPOOL_DIR=${SPOOL_DIR}
 
 DOCS=		ChangeLog docs/FAQ INSTALL docs/INTERNALS README \
 		docs/testing.txt docs/noffle.lsm
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 	's|/etc/noffle.conf|${PREFIX}/etc/noffle.conf|g' \
 		${WRKSRC}/docs/${PORTNAME}.1 \
 		${WRKSRC}/docs/${PORTNAME}.conf.5
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/docs/noffle.1 \
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/noffle.conf.5 \
 		${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/noffle.conf.example \
 		${STAGEDIR}${PREFIX}/etc/noffle.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${SPOOL_DIR}/data \
+		${STAGEDIR}${SPOOL_DIR}/lock \
+		${STAGEDIR}${SPOOL_DIR}/outgoing \
+		${STAGEDIR}${SPOOL_DIR}/overview \
+		${STAGEDIR}${SPOOL_DIR}/requested
+
 
 post-install:
 	${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: head/news/noffle/pkg-plist
===================================================================
--- head/news/noffle/pkg-plist	(revision 370405)
+++ head/news/noffle/pkg-plist	(revision 370406)
@@ -1,20 +1,17 @@
 bin/noffle
 man/man1/noffle.1.gz
 man/man5/noffle.conf.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/noffle.lsm
 %%PORTDOCS%%%%DOCSDIR%%/testing.txt
 etc/noffle.conf.sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@cwd /
-@exec mkdir -p %%SPOOL_DIR%%
-@exec mkdir -p %%SPOOL_DIR%%/data
-@exec mkdir -p %%SPOOL_DIR%%/lock
-@exec mkdir -p %%SPOOL_DIR%%/outgoing
-@exec mkdir -p %%SPOOL_DIR%%/overview
-@exec mkdir -p %%SPOOL_DIR%%/requested
-@unexec rm -rf %%SPOOL_DIR%%
+@dir %%SPOOL_DIR%%/data
+@dir %%SPOOL_DIR%%/lock
+@dir %%SPOOL_DIR%%/outgoing
+@dir %%SPOOL_DIR%%/overview
+@dir %%SPOOL_DIR%%/requested
+@dir %%SPOOL_DIR%%