Fix PLIST when DOCS is enabled and built with javadoc from JDK7 and later.

Note this is just a stopgap.

Reported by:	exp-run (PR190511)
This commit is contained in:
Jung-uk Kim 2014-06-04 22:38:24 +00:00
parent aabf7966f6
commit 6e3f780774
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=356553
4 changed files with 22 additions and 6 deletions

View File

@ -30,10 +30,18 @@ OPTIONS_DEFINE= DOCS
ALL_TARGET+= javadoc
.endif
.include <bsd.port.pre.mk>
.if ${JAVA_PORT_VERSION} == "1.6.0"
PLIST_SUB= JDK6=""
.else
PLIST_SUB= JDK6="@comment "
.endif
do-install:
(cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
.if ${PORT_OPTIONS:MDOCS}
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -377,12 +377,12 @@
%%PORTDOCS%%%%DOCSDIR%%/overview-summary.html
%%PORTDOCS%%%%DOCSDIR%%/overview-tree.html
%%PORTDOCS%%%%DOCSDIR%%/package-list
%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
%%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
%%DATADIR%%/statcvs.jar
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/resources
%%JDK6%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/resources
%%PORTDOCS%%@dirrm %%DOCSDIR%%/net/sf/statcvs/weblinks/bugs/class-use
%%PORTDOCS%%@dirrm %%DOCSDIR%%/net/sf/statcvs/weblinks/bugs
%%PORTDOCS%%@dirrm %%DOCSDIR%%/net/sf/statcvs/weblinks

View File

@ -33,10 +33,18 @@ OPTIONS_DEFINE= DOCS
ALL_TARGET+= javadoc
.endif
.include <bsd.port.pre.mk>
.if ${JAVA_PORT_VERSION} == "1.6.0"
PLIST_SUB= JDK6=""
.else
PLIST_SUB= JDK6="@comment "
.endif
do-install:
(cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
.if ${PORT_OPTIONS:MDOCS}
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -156,12 +156,12 @@
%%PORTDOCS%%%%DOCSDIR%%/overview-summary.html
%%PORTDOCS%%%%DOCSDIR%%/overview-tree.html
%%PORTDOCS%%%%DOCSDIR%%/package-list
%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
%%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
%%DATADIR%%/statsvn.jar
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/resources
%%JDK6%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/resources
%%PORTDOCS%%@dirrm %%DOCSDIR%%/net/sf/statsvn/util/svnkit/class-use
%%PORTDOCS%%@dirrm %%DOCSDIR%%/net/sf/statsvn/util/svnkit
%%PORTDOCS%%@dirrm %%DOCSDIR%%/net/sf/statsvn/util/class-use