Rewrite the whole doc/contrib installation to be more compliant with the

ports committer guide.  Should fix pointyhead's report.

2 files changed, 35 insertions, 42 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index dce2c50a06ac..3608f9cd1e8b 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -16,11 +16,6 @@ COMMENT=	A fast, lightweight source control management system
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=yes
 
-SHAREDDIR=	${PREFIX}/share/${PORTNAME}
-DOCSDIR=	${SHAREDDIR}/doc
-CONTRIBDIR=	${SHAREDDIR}/contrib
-WWWDIR=		${SHAREDDIR}/www
-
 CONTRIB_FILES=	bash_completion \
 		convert-repo \
 		favicon.ico \
@@ -33,25 +28,23 @@ CONTRIB_FILES=	bash_completion \
 		tcsh_completion \
 		zsh_completion
 
+PORTDOCS=	CONTRIBUTORS COPYING README *.txt doc/*.txt
+
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
 post-build:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 
 post-install:
-	${MKDIR} ${SHAREDDIR}
-	${INSTALL_DATA} ${WRKSRC}/CONTRIBUTORS ${SHAREDDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${SHAREDDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${SHAREDDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${SHAREDDIR}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
-	${MKDIR} ${CONTRIBDIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DATADIR}
+	${MKDIR} ${DATADIR}/contrib
 	for f in ${CONTRIB_FILES}; do \
-		${CP} -p ${WRKSRC}/contrib/$${f} ${CONTRIBDIR}; \
+		${CP} -p ${WRKSRC}/contrib/$${f} ${DATADIR}/contrib; \
 	done
-	${MKDIR} ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.cgi ${WWWDIR}
+	${MKDIR} ${DATADIR}/www
+	${INSTALL_MAN} ${WRKSRC}/*.cgi ${DATADIR}/www
 	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 1e57569dd79e..57f957762789 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -182,33 +182,33 @@ bin/hgmerge
 %%PYTHON_SITELIBDIR%%/mercurial/version.py
 %%PYTHON_SITELIBDIR%%/mercurial/version.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/version.pyo
-%%SHAREDDIR%%/CONTRIBUTORS
-%%SHAREDDIR%%/COPYING
-%%SHAREDDIR%%/README
-%%SHAREDDIR%%/comparison.txt
-%%SHAREDDIR%%/notes.txt
-%%SHAREDDIR%%/contrib/bash_completion
-%%SHAREDDIR%%/contrib/convert-repo
-%%SHAREDDIR%%/contrib/favicon.ico
-%%SHAREDDIR%%/contrib/hg-menu.vim
-%%SHAREDDIR%%/contrib/hg-ssh
-%%SHAREDDIR%%/contrib/hgdiff
-%%SHAREDDIR%%/contrib/hgk
-%%SHAREDDIR%%/contrib/hgk.py
-%%SHAREDDIR%%/contrib/mercurial.el
-%%SHAREDDIR%%/contrib/tcsh_completion
-%%SHAREDDIR%%/contrib/zsh_completion
-%%SHAREDDIR%%/doc/hg.1.txt
-%%SHAREDDIR%%/doc/hgignore.5.txt
-%%SHAREDDIR%%/doc/hgmerge.1.txt
-%%SHAREDDIR%%/doc/hgrc.5.txt
-%%SHAREDDIR%%/www/hgweb.cgi
-%%SHAREDDIR%%/www/hgwebdir.cgi
+%%PORTSDOC%%%%DOCSDIR%%/CONTRIBUTORS
+%%PORTSDOC%%%%DOCSDIR%%/COPYING
+%%PORTSDOC%%%%DOCSDIR%%/README
+%%PORTSDOC%%%%DOCSDIR%%/comparison.txt
+%%PORTSDOC%%%%DOCSDIR%%/notes.txt
+%%PORTSDOC%%%%DOCSDIR%%/hg.1.txt
+%%PORTSDOC%%%%DOCSDIR%%/hgignore.5.txt
+%%PORTSDOC%%%%DOCSDIR%%/hgmerge.1.txt
+%%PORTSDOC%%%%DOCSDIR%%/hgrc.5.txt
+%%PORTSDOC%%%%DATADIR%%/contrib/bash_completion
+%%PORTSDOC%%%%DATADIR%%/contrib/convert-repo
+%%PORTSDOC%%%%DATADIR%%/contrib/favicon.ico
+%%PORTSDOC%%%%DATADIR%%/contrib/hg-menu.vim
+%%PORTSDOC%%%%DATADIR%%/contrib/hg-ssh
+%%PORTSDOC%%%%DATADIR%%/contrib/hgdiff
+%%PORTSDOC%%%%DATADIR%%/contrib/hgk
+%%PORTSDOC%%%%DATADIR%%/contrib/hgk.py
+%%PORTSDOC%%%%DATADIR%%/contrib/mercurial.el
+%%PORTSDOC%%%%DATADIR%%/contrib/tcsh_completion
+%%PORTSDOC%%%%DATADIR%%/contrib/zsh_completion
+%%PORTSDOC%%%%DATADIR%%/www/hgweb.cgi
+%%PORTSDOC%%%%DATADIR%%/www/hgwebdir.cgi
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/static
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial
 @dirrm %%PYTHON_SITELIBDIR%%/hgext
-@dirrm %%SHAREDIR%%/www
-@dirrm %%SHAREDIR%%/doc
-@dirrm %%SHAREDIR%%/contrib
-@dirrm %%SHAREDIR%%
+%%PORTSDOC%%@dirrm %%DATADIR%%/www
+%%PORTSDOC%%@dirrm %%DATADIR%%
+%%PORTSDOC%%@dirrm %%DOCSDIR%%/contrib
+%%PORTSDOC%%@dirrm %%DOCSDIR%%