Update PORTDOC compliance

Submitted by:	maintainer

2 files changed, 44 insertions, 46 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8cd77943f167..52e4d9e3c8ad 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -127,7 +127,6 @@ pre-configure:
 	(cd ${WRKSRC}; aclocal -I m4)
 
 .if !defined(NOPORTDOCS)
-PLIST_SUB+=	SUB_DOCS=""
 post-build:
 	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
@@ -716,7 +715,6 @@ PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
 .endif
 .else 	# NOPORTDOCS
-PLIST_SUB+=	SUB_DOCS="@comment "
 PLIST_SUB+=	SUB_HTML="@comment "
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 8d4a7085f03f..f466078e94a2 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -32,49 +32,49 @@ share/locale/tr/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
 share/locale/zh_CN/LC_MESSAGES/mutt.mo
 share/locale/zh_TW/LC_MESSAGES/mutt.mo
-%%SUB_DOCS%%share/doc/mutt/PGP-Notes.txt
-%%SUB_DOCS%%share/doc/mutt/applying-patches.txt
-%%SUB_DOCS%%share/doc/mutt/devel-notes.txt
-%%SUB_DOCS%%share/doc/mutt/COPYRIGHT
-%%SUB_DOCS%%share/doc/mutt/GPL
-%%SUB_DOCS%%share/doc/mutt/INSTALL
-%%SUB_DOCS%%share/doc/mutt/ChangeLog
-%%SUB_DOCS%%share/doc/mutt/README
-%%SUB_DOCS%%share/doc/mutt/NEWS
-%%SUB_DOCS%%share/doc/mutt/TODO
-%%SUB_DOCS%%share/doc/mutt/README.SECURITY
-%%SUB_DOCS%%share/doc/mutt/README.SSL
-%%SUB_DOCS%%share/doc/mutt/manual.txt
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
-%%SUB_DOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
-%%SUB_DOCS%%share/doc/mutt/samples/Mush.rc
-%%SUB_DOCS%%share/doc/mutt/samples/Pine.rc
-%%SUB_DOCS%%share/doc/mutt/samples/gpg.rc
-%%SUB_DOCS%%share/doc/mutt/samples/pgp2.rc
-%%SUB_DOCS%%share/doc/mutt/samples/pgp5.rc
-%%SUB_DOCS%%share/doc/mutt/samples/pgp6.rc
-%%SUB_DOCS%%share/doc/mutt/samples/Tin.rc
-%%SUB_DOCS%%share/doc/mutt/samples/sample.muttrc
-%%SUB_DOCS%%share/doc/mutt/samples/sample.mailcap
-%%SUB_DOCS%%share/doc/mutt/samples/sample.muttrc-tlr
-%%SUB_DOCS%%@dirrm share/doc/mutt/samples/iconv
-%%SUB_DOCS%%@dirrm share/doc/mutt/samples
+%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
+%%PORTDOCS%%share/doc/mutt/applying-patches.txt
+%%PORTDOCS%%share/doc/mutt/devel-notes.txt
+%%PORTDOCS%%share/doc/mutt/COPYRIGHT
+%%PORTDOCS%%share/doc/mutt/GPL
+%%PORTDOCS%%share/doc/mutt/INSTALL
+%%PORTDOCS%%share/doc/mutt/ChangeLog
+%%PORTDOCS%%share/doc/mutt/README
+%%PORTDOCS%%share/doc/mutt/NEWS
+%%PORTDOCS%%share/doc/mutt/TODO
+%%PORTDOCS%%share/doc/mutt/README.SECURITY
+%%PORTDOCS%%share/doc/mutt/README.SSL
+%%PORTDOCS%%share/doc/mutt/manual.txt
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+%%PORTDOCS%%share/doc/mutt/samples/Mush.rc
+%%PORTDOCS%%share/doc/mutt/samples/Pine.rc
+%%PORTDOCS%%share/doc/mutt/samples/gpg.rc
+%%PORTDOCS%%share/doc/mutt/samples/pgp2.rc
+%%PORTDOCS%%share/doc/mutt/samples/pgp5.rc
+%%PORTDOCS%%share/doc/mutt/samples/pgp6.rc
+%%PORTDOCS%%share/doc/mutt/samples/Tin.rc
+%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc
+%%PORTDOCS%%share/doc/mutt/samples/sample.mailcap
+%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tlr
+%%PORTDOCS%%@dirrm share/doc/mutt/samples/iconv
+%%PORTDOCS%%@dirrm share/doc/mutt/samples
 %%SUB_HTML%%share/doc/mutt/manual.latin1
 %%SUB_HTML%%share/doc/mutt/html/manual-1.html
 %%SUB_HTML%%share/doc/mutt/html/manual-2.html
@@ -645,4 +645,4 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_N%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual353.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
-%%SUB_DOCS%%@dirrm share/doc/mutt
+%%PORTDOCS%%@dirrm share/doc/mutt