Index: Mk/Uses/webplugin.mk
===================================================================
--- Mk/Uses/webplugin.mk	(revision 333578)
+++ Mk/Uses/webplugin.mk	(working copy)
@@ -167,20 +167,19 @@
 PLIST_SUB+=		WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}"
 
 _LNWF=		${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,}
-.for f in ${WEBPLUGIN_FILES}
-PLIST_FILES+=	${_WEBPLUGIN_LINKFARMS:S,${LOCALBASE}/,,:C,(.*),\1/${f},}
-.endfor
-PLIST_DIRSTRY+=	${_WEBPLUGIN_SLDIRS:S,^${LOCALBASE}/,,} \
-		${_WEBPLUGIN_SLDIR:S,^${LOCALBASE}/,,} \
-		${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,,}
 
 webplugin-post-install:
+	@${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}
 .for d in ${_WEBPLUGIN_LINKFARMS}
 	${INSTALL} -d ${STAGEDIR}${d}
 .for l in ${_LNWF}
 	${LN} -sf ${l} ${STAGEDIR}${d}/
+	@${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:C,.*/,,}" >> ${TMPPLIST}
 .endfor
+	@${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
 .endfor
+	@${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
 
 post-install: webplugin-post-install