13 files changed, 80 insertions, 165 deletions

diff --git a/www/nanoblogger-extra/Makefile b/www/nanoblogger-extra/Makefile
index d1a64befa330..b86c5af43870 100644
--- a/www/nanoblogger-extra/Makefile
+++ b/www/nanoblogger-extra/Makefile
@@ -7,39 +7,39 @@
 #
 
 PORTNAME=	nanoblogger-extra
-PORTVERSION=	3.4
-PORTREVISION=	1
+PORTVERSION=	3.4.2
 CATEGORIES=	www
-MASTER_SITES=	SF/nanoblogger/${PORTNAME}/Version%20${PORTVERSION}
+MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
 
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Extras for nanoblogger, a small weblog engine
 
 RUN_DEPENDS=	nb:${PORTSDIR}/www/nanoblogger
 
+WRKSRC=		${WRKDIR}/nanoblogger-${PORTVERSION}
 DATADIR=	${PREFIX}/share/nanoblogger
 
 NO_BUILD=	yes
 
 do-install:
 .for data in default lang plugins
-	( cd ${WRKSRC}/${data} && ${CHMOD} 777 ${WRKSRC}/${data}/* && \
+	@( cd ${WRKSRC}/${data} && ${CHMOD} 777 ${WRKSRC}/${data}/* && \
 		${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -empty" )
 .endfor
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for doc in COPYING README
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for doc in COPYING ChangeLog README
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
-	${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
 .endif
 
 .if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/examples/nanoblogger.bash_completion ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/examples/nanoblogger.bash_completion ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/nanoblogger-extra/distinfo b/www/nanoblogger-extra/distinfo
index 066de40d363a..d66c7308fafb 100644
--- a/www/nanoblogger-extra/distinfo
+++ b/www/nanoblogger-extra/distinfo
@@ -1,3 +1,3 @@
-MD5 (nanoblogger-extra-3.4.tar.gz) = 0c64600939a50faf67fb8ba1a6431ef1
-SHA256 (nanoblogger-extra-3.4.tar.gz) = 6f92ba47cf28b9caa6e309196ec4018988708dee87219631940da450def7bc3b
-SIZE (nanoblogger-extra-3.4.tar.gz) = 68202
+MD5 (nanoblogger-extra-3.4.2.tar.gz) = 87fd0a60169e9a810aa616979447c243
+SHA256 (nanoblogger-extra-3.4.2.tar.gz) = 4e9f8952c41e5aff5d9926060ec68a26bb2e2615b35d34bc90b2b7f61e4ca5df
+SIZE (nanoblogger-extra-3.4.2.tar.gz) = 66006
diff --git a/www/nanoblogger-extra/pkg-plist b/www/nanoblogger-extra/pkg-plist
index 180356b43eea..aba314882c70 100644
--- a/www/nanoblogger-extra/pkg-plist
+++ b/www/nanoblogger-extra/pkg-plist
@@ -1,4 +1,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/html/nanoblogger_de.html
 %%PORTDOCS%%%%DOCSDIR%%/html/nanoblogger_fr.html
@@ -24,15 +25,11 @@
 %%DATADIR%%/lang/tr/messages.lang
 %%DATADIR%%/lang/tr/plugins.lang
 %%DATADIR%%/lang/tr/templates.lang
-%%DATADIR%%/lang/zh_TW/help.txt
-%%DATADIR%%/lang/zh_TW/messages.lang
-%%DATADIR%%/lang/zh_TW/plugins.lang
-%%DATADIR%%/lang/zh_TW/templates.lang
 %%DATADIR%%/plugins/001_mymood.off
 %%DATADIR%%/plugins/archive/category/include_listings.sh
 %%DATADIR%%/plugins/archive/master_fullindex.off
-%%DATADIR%%/plugins/entry/format/autopbr.sh
 %%DATADIR%%/plugins/entry/z0_excerpt.off
+%%DATADIR%%/plugins/entry/format/autotag-p.sh
 %%DATADIR%%/plugins/file_links.sh
 %%DATADIR%%/plugins/fortune.sh
 %%DATADIR%%/plugins/page/format/autopbr.sh
@@ -40,6 +37,7 @@
 %%DATADIR%%/plugins/rss.sh
 %%DATADIR%%/plugins/shortcode/yahoobuzz.sh
 %%DATADIR%%/plugins/shortcode/youtube.sh
+%%DATADIR%%/plugins/z001_articles_text.off
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/
@@ -50,14 +48,13 @@
 @dirrmtry %%DATADIR%%/lang/es
 @dirrmtry %%DATADIR%%/lang/fr
 @dirrmtry %%DATADIR%%/lang/tr
-@dirrmtry %%DATADIR%%/lang/zh_TW
 @dirrmtry %%DATADIR%%/lang
 @dirrmtry %%DATADIR%%/plugins/archive/category
 @dirrmtry %%DATADIR%%/plugins/archive
 @dirrmtry %%DATADIR%%/plugins/entry/format
 @dirrmtry %%DATADIR%%/plugins/entry
 @dirrmtry %%DATADIR%%/plugins/page/format
-@dirrmtry %%DATADIR%%/plugins/shortcode
 @dirrmtry %%DATADIR%%/plugins/page
+@dirrmtry %%DATADIR%%/plugins/shortcode
 @dirrmtry %%DATADIR%%/plugins
 @dirrmtry %%DATADIR%%
diff --git a/www/nanoblogger/Makefile b/www/nanoblogger/Makefile
index 70562e5a65f4..484b89b69d72 100644
--- a/www/nanoblogger/Makefile
+++ b/www/nanoblogger/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	nanoblogger
-PORTVERSION=	3.4
+PORTVERSION=	3.4.2
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
+MASTER_SITES=	http://nanoblogger.sourceforge.net/downloads/
 
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Small weblog engine written in Bash for the command line
@@ -27,27 +27,27 @@ post-patch:
 	@${REINPLACE_CMD} -e "s,%%DOCSDIR%%,${DOCSDIR},g" ${WRKSRC}/nb
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
-	${MKDIR} ${DATADIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/nb ${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/nb.conf ${PREFIX}/etc/nb.conf.sample
+	@${MKDIR} ${DATADIR}
 .for data in default lang lib moods plugins
-	${MKDIR} ${DATADIR}/${data} && \
+	@${MKDIR} ${DATADIR}/${data} && \
 		( cd ${WRKSRC}/${data} && \
 			${COPYTREE_SHARE} \* ${DATADIR}/${data} "! -name *.orig" )
 .endfor
-	${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR}
+	@${CP} ${WRKSRC}/welcome-to-nb.txt ${DATADIR}
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/nb.conf ]; then \
 		${CP} -p ${PREFIX}/etc/nb.conf.sample ${PREFIX}/etc/nb.conf; \
 	fi
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 .for doc in COPYING ChangeLog README TODO copyright
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
-	${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/docs/nanoblogger.html ${DOCSDIR}/html
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/nanoblogger/distinfo b/www/nanoblogger/distinfo
index d9a950a8a3ed..0d7ebdec75f0 100644
--- a/www/nanoblogger/distinfo
+++ b/www/nanoblogger/distinfo
@@ -1,3 +1,3 @@
-MD5 (nanoblogger-3.4.tar.gz) = 6162a3637ab22e98ac4267e0db687fe1
-SHA256 (nanoblogger-3.4.tar.gz) = 29c42b3d5e356fb17ca08693279f16e966aeecf430d1a1cab8601c130b3a5a02
-SIZE (nanoblogger-3.4.tar.gz) = 95517
+MD5 (nanoblogger-3.4.2.tar.gz) = 9de66534776d557c4611cabbdedcaaff
+SHA256 (nanoblogger-3.4.2.tar.gz) = 8631802db56c3e2c01df94f60aa30e7b1500c1a76112741a740d9eaf3bd32044
+SIZE (nanoblogger-3.4.2.tar.gz) = 86877
diff --git a/www/nanoblogger/files/patch-nb b/www/nanoblogger/files/patch-nb
index 23b30387158b..9bec2ea31daa 100644
--- a/www/nanoblogger/files/patch-nb
+++ b/www/nanoblogger/files/patch-nb
@@ -1,17 +1,17 @@
---- ./nb.orig	2009-04-26 03:55:07.000000000 +0200
-+++ ./nb	2009-06-22 09:31:59.000000000 +0200
+--- ./nb.orig	2010-02-15 22:01:53.000000000 +0100
++++ ./nb	2010-03-01 22:12:55.000000000 +0100
 @@ -1,4 +1,4 @@
 -#! /bin/bash
 +#! %%LOCALBASE%%/bin/bash
  ############################################################
- #  NanoBlogger 3.4 Copyright 2009 n1xt3r (Kevin R. Wood)   #
+ #  NanoBlogger 3.4.2 Copyright 2010 n1xt3r (Kevin R. Wood) #
  ############################################################
-@@ -9,11 +9,11 @@
+@@ -11,11 +11,11 @@
  
  # -- hardcoded paths --
  # where to expect nanoblogger's base
 -NB_BASE_DIR=`dirname $0`
-+NB_BASE_DIR=%%DATADIR%%
++NB_BASE_DIR="%%DATADIR%%"
  # where to expect nanoblogger's documentation
 -NB_DOC_DIR="$NB_BASE_DIR/docs"
 +NB_DOC_DIR="%%DOCSDIR%%"
@@ -21,7 +21,7 @@
  # nanoblogger's language definitions directory.
  NB_LANG_DIR="${NB_BASE_DIR}/lang"
  # nanoblogger's module directory.
-@@ -863,6 +863,9 @@
+@@ -875,6 +875,9 @@
  			for weblog_dir in "$NB_BASE_DIR"/default/*; do
  				cp -R "$weblog_dir" "$BLOG_DIR"
  			done
diff --git a/www/nanoblogger/files/patch-nb.conf b/www/nanoblogger/files/patch-nb.conf
index 6f992042ae31..5c3f0b7fb930 100644
--- a/www/nanoblogger/files/patch-nb.conf
+++ b/www/nanoblogger/files/patch-nb.conf
@@ -1,5 +1,5 @@
---- ./nb.conf.orig	2007-02-19 00:55:08.000000000 +0100
-+++ ./nb.conf	2009-06-22 09:31:59.000000000 +0200
+--- ./nb.conf.orig	2010-02-15 02:14:23.000000000 +0100
++++ ./nb.conf	2010-03-01 22:10:36.000000000 +0100
 @@ -7,7 +7,7 @@
  NB_LANG="en"
  
diff --git a/www/nanoblogger/files/patch-plugins__archive__master_index.sh b/www/nanoblogger/files/patch-plugins__archive__master_index.sh
deleted file mode 100644
index d1c9b314fe3d..000000000000
--- a/www/nanoblogger/files/patch-plugins__archive__master_index.sh
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./plugins/archive/master_index.sh.orig	2008-05-27 06:37:33.000000000 +0200
-+++ ./plugins/archive/master_index.sh	2009-06-22 09:31:59.000000000 +0200
-@@ -65,7 +65,7 @@
- 	cat_total=${#db_categories[*]}
- 	if [ "$cat_total" -gt 0 ]; then
- 		# make NB_CategoryLinks placeholder
--		NB_BrowseCategoryLinks=$(
-+		NB_BrowseCategoryLinks=`
- 		cat <<-EOF
- 			<a id="category"></a>
- 			<strong>$template_browsecat</strong>
-@@ -73,7 +73,7 @@
- 				$NB_ArchiveCategoryLinks
- 			</div>
- 			<br />
--		EOF)
-+		EOF`
- 	fi
- 
- 	# make NB_ArchiveLinks placeholder
diff --git a/www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh b/www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh
deleted file mode 100644
index 356c1745e93e..000000000000
--- a/www/nanoblogger/files/patch-plugins__archive__year__year_archive.sh
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./plugins/archive/year/year_archive.sh.orig	2008-07-15 20:11:53.000000000 +0200
-+++ ./plugins/archive/year/year_archive.sh	2009-06-22 09:33:11.000000000 +0200
-@@ -50,7 +50,7 @@
- 		set_baseurl "../../"
- 
- 		ARCHENTRY_LIST=${DB_RESULTS[*]}
--		NB_ArchiveEntryLinks=$(
-+		NB_ArchiveEntryLinks=`
- 		for entry in ${ARCHENTRY_LIST[*]}; do
- 			NB_EntryID=$x_id${entrylink_var//[\/]/-}
- 			set_entrylink "$entry"
-@@ -66,12 +66,12 @@
- 				# Command to help filter order of categories
- 				: ${CATLINKS_FILTERCMD:=sort}
- 				>"$SCRATCH_FILE".cat_links
--				entry_wcatids=`grep "$entry" "$NB_DATA_DIR/master.$NB_DBTYPE"`
-+				entry_wcatids=$(grep "$entry" "$NB_DATA_DIR/master.$NB_DBTYPE")
- 				entry_catids=${entry_wcatids##*\>}
- 				[ "$entry_wcatids" = "$entry_catids" ] &&
- 					entry_catids=
- 				for entry_catnum in ${entry_catids//\,/ }; do
--					cat_title=`nb_print "$NB_DATA_DIR"/cat_"$entry_catnum.$NB_DBTYPE" 1`
-+					cat_title=$(nb_print "$NB_DATA_DIR"/cat_"$entry_catnum.$NB_DBTYPE" 1)
- 					set_catlink cat_"$entry_catnum.$NB_DBTYPE"
- 					cat_index="$category_link"
- 					# following must fit on single line
-@@ -92,7 +92,7 @@
- 				- <a href="${ARCHIVES_PATH}$NB_EntryPermalink">$NB_ArchiveEntryTitle</a>
- 				$([ ! -z "$NB_EntryCategories" ] && echo "- $NB_EntryCategories")<br />
- 			EOF
--		done; month=)
-+		done; month=`
- 
- 		# create links for monthly archives
- 		[ -z "$CAL_CMD" ] && CAL_CMD="cal"
diff --git a/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh b/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
new file mode 100644
index 000000000000..b95010b72acb
--- /dev/null
+++ b/www/nanoblogger/files/patch-plugins__entry__format__markdown.sh
@@ -0,0 +1,11 @@
+--- ./plugins/entry/format/markdown.sh.orig	2010-02-14 21:42:17.000000000 +0100
++++ ./plugins/entry/format/markdown.sh	2010-03-01 22:10:36.000000000 +0100
+@@ -5,7 +5,7 @@
+ : ${MARKDOWN_CMD:=markdown}
+ : ${MARKDOWN_OPTS:= }
+ 
+-nb_eval "$MARKDOWN_CMD" && MARKDOWN_INPATH=true
++nb_eval "$MARKDOWN_CMD -v" && MARKDOWN_INPATH=true
+ 	
+ if [ "$MARKDOWN_INPATH" = "true" ]; then
+ 	# nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..."
diff --git a/www/nanoblogger/files/patch-plugins__page__feed_links.sh b/www/nanoblogger/files/patch-plugins__page__feed_links.sh
deleted file mode 100644
index 4867eb3315fe..000000000000
--- a/www/nanoblogger/files/patch-plugins__page__feed_links.sh
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./plugins/page/feed_links.sh.orig	2007-02-05 00:12:00.000000000 +0100
-+++ ./plugins/page/feed_links.sh	2009-06-22 09:31:59.000000000 +0200
-@@ -16,14 +16,14 @@
- 		NB_AtomLink="${BASE_URL}atom.$NB_SYND_FILETYPE"
- 		NB_AtomTitle="Atom $NB_AtomVer"
- 	fi
--	NB_AtomAltLink=$(
-+	NB_AtomAltLink=`
- 	cat <<-EOF
- 		<link rel="alternate" type="application/atom+xml"
- 			title="$NB_AtomTitle"
- 			href="$NB_AtomLink"
- 		/>
- 	EOF
--	)
-+	`
- fi
- 
- # RSS 2.0
-@@ -36,14 +36,14 @@
- 		NB_RSS2Link="${BASE_URL}rss.$NB_SYND_FILETYPE"
- 		NB_RSS2Title="RSS $NB_RSS2Ver"
- 	fi
--	NB_RSS2AltLink=$(
-+	NB_RSS2AltLink=`
- 	cat <<-EOF
- 		<link rel="alternate" type="application/rss+xml"
- 			title="$NB_RSS2Title"
- 			href="$NB_RSS2Link"
- 		/>
- 	EOF
--	)
-+	`
- fi
- 
- # RSS 1.0
-@@ -56,13 +56,13 @@
- 		NB_RSSLink="${BASE_URL}index.$NB_SYND_FILETYPE"
- 		NB_RSSTitle="RSS $NB_RSSVer"
- 	fi
--	NB_RSSAltLink=$(
-+	NB_RSSAltLink=`
- 	cat <<-EOF
- 		<link rel="alternate" type="application/rss+xml"
- 			title="$NB_RSSTitle"
- 			href="$NB_RSSLink"
- 		/>
- 	EOF
--	)
-+	`
- fi
- 
diff --git a/www/nanoblogger/files/patch-plugins__page__format__markdown.sh b/www/nanoblogger/files/patch-plugins__page__format__markdown.sh
new file mode 100644
index 000000000000..6ecce8a6a756
--- /dev/null
+++ b/www/nanoblogger/files/patch-plugins__page__format__markdown.sh
@@ -0,0 +1,11 @@
+--- ./plugins/page/format/markdown.sh.orig	2009-08-10 02:01:37.000000000 +0200
++++ ./plugins/page/format/markdown.sh	2010-03-01 22:10:36.000000000 +0100
+@@ -5,7 +5,7 @@
+ : ${MARKDOWN_CMD:=markdown}
+ : ${MARKDOWN_OPTS:= }
+ 
+-nb_eval "$MARKDOWN_CMD" && MARKDOWN_INPATH=true
++nb_eval "$MARKDOWN_CMD -v" && MARKDOWN_INPATH=true
+ 
+ if [ "$MARKDOWN_INPATH" = "true" ]; then
+ 	nb_msg "$plugins_entryfilteraction `basename $nb_plugin` ..."
diff --git a/www/nanoblogger/pkg-plist b/www/nanoblogger/pkg-plist
index 8f82034384b8..140c4d3b98cd 100644
--- a/www/nanoblogger/pkg-plist
+++ b/www/nanoblogger/pkg-plist
@@ -4,6 +4,8 @@ etc/nb.conf.sample
 @exec if [ ! -f %D/etc/nb.conf ] ; then cp -p %D/%F %B/nb.conf; fi
 @exec mkdir -p %D/share/nanoblogger/default/cache
 @exec mkdir -p %D/share/nanoblogger/default/plugins
+@exec mkdir -p %D/share/nanoblogger/plugins/entry/mod
+@exec mkdir -p %D/share/nanoblogger/plugins/page/mod
 %%DATADIR%%/default/articles/example.txt
 %%DATADIR%%/default/blog.conf
 %%DATADIR%%/default/data/cat_1.db
@@ -13,6 +15,7 @@ etc/nb.conf.sample
 %%DATADIR%%/default/styles/nb_clean.css
 %%DATADIR%%/default/styles/nb_default.css
 %%DATADIR%%/default/styles/print.css
+%%DATADIR%%/default/templates/archive_index.htm
 %%DATADIR%%/default/templates/category_archive.htm
 %%DATADIR%%/default/templates/category_entry.htm
 %%DATADIR%%/default/templates/day_archive.htm
@@ -62,7 +65,7 @@ etc/nb.conf.sample
 %%DATADIR%%/plugins/atom.sh
 %%DATADIR%%/plugins/calendar.sh
 %%DATADIR%%/plugins/entry/category_links.sh
-%%DATADIR%%/plugins/entry/format/autobr.sh
+%%DATADIR%%/plugins/entry/format/autotag-br.sh
 %%DATADIR%%/plugins/entry/format/markdown.sh
 %%DATADIR%%/plugins/entry/format/raw.sh
 %%DATADIR%%/plugins/makepage/tidy.sh
@@ -90,30 +93,30 @@ etc/nb.conf.sample
 @dirrm %%DATADIR%%/default/cache
 @dirrm %%DATADIR%%/default/data
 @dirrm %%DATADIR%%/default/images
-@dirrmtry %%DATADIR%%/default/plugins
-@dirrm %%DATADIR%%/default/styles
-@dirrm %%DATADIR%%/default/templates
-@dirrm %%DATADIR%%/default
+@dirrm %%DATADIR%%/default/plugins
+@dirrmtry %%DATADIR%%/default/styles
+@dirrmtry %%DATADIR%%/default/templates
+@dirrmtry %%DATADIR%%/default
 @dirrm %%DATADIR%%/lang/en
-@dirrm %%DATADIR%%/lang
+@dirrmtry %%DATADIR%%/lang
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/moods/smilies
 @dirrm %%DATADIR%%/moods
 @dirrmtry %%DATADIR%%/plugins/archive/category
-@dirrmtry %%DATADIR%%/plugins/archive/day
-@dirrmtry %%DATADIR%%/plugins/archive/month
-@dirrmtry %%DATADIR%%/plugins/archive/year
+@dirrm %%DATADIR%%/plugins/archive/day
+@dirrm %%DATADIR%%/plugins/archive/month
+@dirrm %%DATADIR%%/plugins/archive/year
 @dirrmtry %%DATADIR%%/plugins/archive
 @dirrmtry %%DATADIR%%/plugins/entry/format
-@dirrmtry %%DATADIR%%/plugins/entry/mod
+@dirrm %%DATADIR%%/plugins/entry/mod
 @dirrmtry %%DATADIR%%/plugins/entry
 @dirrm %%DATADIR%%/plugins/makepage
-@dirrm %%DATADIR%%/plugins/page/format
-@dirrmtry %%DATADIR%%/plugins/page/mod
+@dirrmtry %%DATADIR%%/plugins/page/format
+@dirrm %%DATADIR%%/plugins/page/mod
 @dirrmtry %%DATADIR%%/plugins/page
 @dirrm %%DATADIR%%/plugins/post
-@dirrm %%DATADIR%%/plugins/shortcode
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/
+@dirrmtry %%DATADIR%%/plugins/shortcode
+@dirrmtry %%DATADIR%%/plugins
+@dirrmtry %%DATADIR%%/
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/