2 files changed, 99 insertions, 99 deletions

diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index db944c1a0f25..5245b048e91d 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -102,7 +102,7 @@ do-install:
 	find ${WRKSRC} \! -type d -maxdepth 1 \! -name UPGRADING* -exec \
 		${INSTALL_SCRIPT} {} ${PREFIX}/${BUGZILLADIR} \;
 	${TAR} -C ${WRKSRC} -cf - template css | ${TAR} --unlink -C ${PREFIX}/${BUGZILLADIR} -xf -
-.if !defined(NOPORTSDOCS)
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} --unlink -C ${DOCSDIR} -xf -
 .endif
@@ -113,7 +113,7 @@ do-install:
 		mysqld-watcher.pl yp_nomail.sh ${PREFIX}/${BUGZILLADIR}/contrib
 	cd ${WRKSRC}/contrib/cmdline; ${INSTALL_SCRIPT} buglist bugs \
 		query.conf ${PREFIX}/${BUGZILLADIR}/contrib/cmdline
-.if !defined(NOPORTSDOCS)
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/contrib
 	cd ${WRKSRC}/contrib; ${INSTALL_DATA} README README.Mailif \
 		bugmail_help.html bugzilla.procmailrc ${DOCSDIR}/contrib
diff --git a/devel/bugzilla2/pkg-plist b/devel/bugzilla2/pkg-plist
index d0c6dabd9ecf..fee6720525b7 100644
--- a/devel/bugzilla2/pkg-plist
+++ b/devel/bugzilla2/pkg-plist
@@ -1,94 +1,94 @@
-%%PORTDOCS%%share/doc/bugzilla/html/about.html
-%%PORTDOCS%%share/doc/bugzilla/html/aboutthisguide.html
-%%PORTDOCS%%share/doc/bugzilla/html/administration.html
-%%PORTDOCS%%share/doc/bugzilla/html/Bugzilla-Guide.html
-%%PORTDOCS%%share/doc/bugzilla/html/cmdline.html
-%%PORTDOCS%%share/doc/bugzilla/html/conventions.html
-%%PORTDOCS%%share/doc/bugzilla/html/copyright.html
-%%PORTDOCS%%share/doc/bugzilla/html/credits.html
-%%PORTDOCS%%share/doc/bugzilla/html/cust-templates.html
-%%PORTDOCS%%share/doc/bugzilla/html/database.html
-%%PORTDOCS%%share/doc/bugzilla/html/dbdoc.html
-%%PORTDOCS%%share/doc/bugzilla/html/dbschema.html
-%%PORTDOCS%%share/doc/bugzilla/html/disclaimer.html
-%%PORTDOCS%%share/doc/bugzilla/html/extraconfig.html
-%%PORTDOCS%%share/doc/bugzilla/html/faq.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-0.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-1.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-10.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-2.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-3.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-4.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-5.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-6.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-7.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-8.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-9.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl-howto.html
-%%PORTDOCS%%share/doc/bugzilla/html/gfdl.html
-%%PORTDOCS%%share/doc/bugzilla/html/glossary.html
-%%PORTDOCS%%share/doc/bugzilla/html/groups.html
-%%PORTDOCS%%share/doc/bugzilla/html/hintsandtips.html
-%%PORTDOCS%%share/doc/bugzilla/html/how.html
-%%PORTDOCS%%share/doc/bugzilla/html/index.html
-%%PORTDOCS%%share/doc/bugzilla/html/installation.html
-%%PORTDOCS%%share/doc/bugzilla/html/integration.html
-%%PORTDOCS%%share/doc/bugzilla/html/introduction.html
-%%PORTDOCS%%share/doc/bugzilla/html/newversions.html
-%%PORTDOCS%%share/doc/bugzilla/html/osx.html
-%%PORTDOCS%%share/doc/bugzilla/html/parameters.html
-%%PORTDOCS%%share/doc/bugzilla/html/patches.html
-%%PORTDOCS%%share/doc/bugzilla/html/programadmin.html
-%%PORTDOCS%%share/doc/bugzilla/html/rewrite.html
-%%PORTDOCS%%share/doc/bugzilla/html/security.html
-%%PORTDOCS%%share/doc/bugzilla/html/stepbystep.html
-%%PORTDOCS%%share/doc/bugzilla/html/troubleshooting.html
-%%PORTDOCS%%share/doc/bugzilla/html/upgrading.html
-%%PORTDOCS%%share/doc/bugzilla/html/useradmin.html
-%%PORTDOCS%%share/doc/bugzilla/html/userpreferences.html
-%%PORTDOCS%%share/doc/bugzilla/html/using.html
-%%PORTDOCS%%share/doc/bugzilla/html/variant-fenris.html
-%%PORTDOCS%%share/doc/bugzilla/html/variant-scarab.html
-%%PORTDOCS%%share/doc/bugzilla/html/voting.html
-%%PORTDOCS%%share/doc/bugzilla/html/variant-issuezilla.html
-%%PORTDOCS%%share/doc/bugzilla/html/variant-perforce.html
-%%PORTDOCS%%share/doc/bugzilla/html/variant-redhat.html
-%%PORTDOCS%%share/doc/bugzilla/html/variant-sourceforge.html
-%%PORTDOCS%%share/doc/bugzilla/html/variants.html
-%%PORTDOCS%%share/doc/bugzilla/html/whatis.html
-%%PORTDOCS%%share/doc/bugzilla/html/why.html
-%%PORTDOCS%%share/doc/bugzilla/html/win32.html
-%%PORTDOCS%%share/doc/bugzilla/images/caution.gif
-%%PORTDOCS%%share/doc/bugzilla/images/dbschema.jpg
-%%PORTDOCS%%share/doc/bugzilla/images/dbschema.ps
-%%PORTDOCS%%share/doc/bugzilla/images/note.gif
-%%PORTDOCS%%share/doc/bugzilla/images/tip.gif
-%%PORTDOCS%%share/doc/bugzilla/images/warning.gif
-%%PORTDOCS%%share/doc/bugzilla/makedocs.pl
-%%PORTDOCS%%share/doc/bugzilla/rel_notes.txt
-%%PORTDOCS%%share/doc/bugzilla/txt/Bugzilla-Guide.txt
-%%PORTDOCS%%share/doc/bugzilla/xml/Bugzilla-Guide.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/about.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/administration.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/conventions.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/database.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/dbschema.mysql
-%%PORTDOCS%%share/doc/bugzilla/xml/faq.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/filetemp.patch
-%%PORTDOCS%%share/doc/bugzilla/xml/gd-makefile.patch
-%%PORTDOCS%%share/doc/bugzilla/xml/gfdl.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/glossary.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/index.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/installation.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/integration.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/introduction.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/patches.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/using.xml
-%%PORTDOCS%%share/doc/bugzilla/xml/variants.xml
-%%PORTDOCS%%%%CONTRIB%%share/doc/bugzilla/contrib/README
-%%PORTDOCS%%%%CONTRIB%%share/doc/bugzilla/contrib/README.Mailif
-%%PORTDOCS%%%%CONTRIB%%share/doc/bugzilla/contrib/bugmail_help.html
-%%PORTDOCS%%%%CONTRIB%%share/doc/bugzilla/contrib/bugzilla.procmailrc
+%%PORTDOCS%%%%DOCSDIR%%/html/about.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aboutthisguide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/administration.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Bugzilla-Guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cmdline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/conventions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/html/credits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cust-templates.html
+%%PORTDOCS%%%%DOCSDIR%%/html/database.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dbdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dbschema.html
+%%PORTDOCS%%%%DOCSDIR%%/html/disclaimer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/extraconfig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-0.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl-howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gfdl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/html/groups.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hintsandtips.html
+%%PORTDOCS%%%%DOCSDIR%%/html/how.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/integration.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/newversions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/osx.html
+%%PORTDOCS%%%%DOCSDIR%%/html/parameters.html
+%%PORTDOCS%%%%DOCSDIR%%/html/patches.html
+%%PORTDOCS%%%%DOCSDIR%%/html/programadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rewrite.html
+%%PORTDOCS%%%%DOCSDIR%%/html/security.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stepbystep.html
+%%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
+%%PORTDOCS%%%%DOCSDIR%%/html/useradmin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/userpreferences.html
+%%PORTDOCS%%%%DOCSDIR%%/html/using.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variant-fenris.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variant-scarab.html
+%%PORTDOCS%%%%DOCSDIR%%/html/voting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variant-issuezilla.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variant-perforce.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variant-redhat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variant-sourceforge.html
+%%PORTDOCS%%%%DOCSDIR%%/html/variants.html
+%%PORTDOCS%%%%DOCSDIR%%/html/whatis.html
+%%PORTDOCS%%%%DOCSDIR%%/html/why.html
+%%PORTDOCS%%%%DOCSDIR%%/html/win32.html
+%%PORTDOCS%%%%DOCSDIR%%/images/caution.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/dbschema.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/dbschema.ps
+%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
+%%PORTDOCS%%%%DOCSDIR%%/makedocs.pl
+%%PORTDOCS%%%%DOCSDIR%%/rel_notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/Bugzilla-Guide.txt
+%%PORTDOCS%%%%DOCSDIR%%/xml/Bugzilla-Guide.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/about.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/administration.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/conventions.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/database.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/dbschema.mysql
+%%PORTDOCS%%%%DOCSDIR%%/xml/faq.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/filetemp.patch
+%%PORTDOCS%%%%DOCSDIR%%/xml/gd-makefile.patch
+%%PORTDOCS%%%%DOCSDIR%%/xml/gfdl.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/glossary.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/index.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/installation.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/integration.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/introduction.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/patches.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/using.xml
+%%PORTDOCS%%%%DOCSDIR%%/xml/variants.xml
+%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/README
+%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/README.Mailif
+%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/bugmail_help.html
+%%PORTDOCS%%%%CONTRIB%%%%DOCSDIR%%/contrib/bugzilla.procmailrc
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/BugzillaEmail.pm
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bug_email.pl
 %%CONTRIB%%%%BUGZILLADIR%%/contrib/bugzilla_email_append.pl
@@ -276,9 +276,9 @@
 @dirrm %%BUGZILLADIR%%/template
 @dirrm %%BUGZILLADIR%%/css
 @dirrm %%BUGZILLADIR%%
-%%PORTDOCS%%%%CONTRIB%%@dirrm share/doc/bugzilla/contrib
-%%PORTDOCS%%@dirrm share/doc/bugzilla/xml
-%%PORTDOCS%%@dirrm share/doc/bugzilla/txt
-%%PORTDOCS%%@dirrm share/doc/bugzilla/images
-%%PORTDOCS%%@dirrm share/doc/bugzilla/html
-%%PORTDOCS%%@dirrm share/doc/bugzilla
+%%PORTDOCS%%%%CONTRIB%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%