diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-05 06:38:24 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-05 06:38:24 +0800 |
| commit | 2a0af607f8f2a4cf6ebc7f0e694f45982809d738 (patch) | |
| tree | ddf238af7cb6149e3df3c7692b80586561ce7f71 /devel | |
| parent | 065b1f0ce4789a05a5a610ebb00eb3803b3455b2 (diff) | |
| download | freebsd-ports-gnome-2a0af607f8f2a4cf6ebc7f0e694f45982809d738.tar.gz freebsd-ports-gnome-2a0af607f8f2a4cf6ebc7f0e694f45982809d738.tar.zst freebsd-ports-gnome-2a0af607f8f2a4cf6ebc7f0e694f45982809d738.zip | |
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)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/statcvs/Makefile | 10 | ||||
| -rw-r--r-- | devel/statcvs/pkg-plist | 4 | ||||
| -rw-r--r-- | devel/statsvn/Makefile | 10 | ||||
| -rw-r--r-- | devel/statsvn/pkg-plist | 4 |
4 files changed, 22 insertions, 6 deletions
diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile index 08f8ef02ed80..594952e8527c 100644 --- a/devel/statcvs/Makefile +++ b/devel/statcvs/Makefile @@ -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> diff --git a/devel/statcvs/pkg-plist b/devel/statcvs/pkg-plist index f8867c576d7c..1689f9930713 100644 --- a/devel/statcvs/pkg-plist +++ b/devel/statcvs/pkg-plist @@ -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 diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile index 211d78422ad2..c2b82dc27415 100644 --- a/devel/statsvn/Makefile +++ b/devel/statsvn/Makefile @@ -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> diff --git a/devel/statsvn/pkg-plist b/devel/statsvn/pkg-plist index d1a2dc6866e8..0e0c3eb65c9b 100644 --- a/devel/statsvn/pkg-plist +++ b/devel/statsvn/pkg-plist @@ -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 |