Date: Wed, 4 Jun 2014 22:38:24 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356553 - in head/devel: statcvs statsvn Message-ID: <201406042238.s54McOI1057753@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Jun 4 22:38:24 2014 New Revision: 356553 URL: http://svnweb.freebsd.org/changeset/ports/356553 QAT: https://qat.redports.org/buildarchive/r356553/ Log: 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) Modified: head/devel/statcvs/Makefile head/devel/statcvs/pkg-plist head/devel/statsvn/Makefile head/devel/statsvn/pkg-plist Modified: head/devel/statcvs/Makefile ============================================================================== --- head/devel/statcvs/Makefile Wed Jun 4 22:10:18 2014 (r356552) +++ head/devel/statcvs/Makefile Wed Jun 4 22:38:24 2014 (r356553) @@ -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> Modified: head/devel/statcvs/pkg-plist ============================================================================== --- head/devel/statcvs/pkg-plist Wed Jun 4 22:10:18 2014 (r356552) +++ head/devel/statcvs/pkg-plist Wed Jun 4 22:38:24 2014 (r356553) @@ -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 Modified: head/devel/statsvn/Makefile ============================================================================== --- head/devel/statsvn/Makefile Wed Jun 4 22:10:18 2014 (r356552) +++ head/devel/statsvn/Makefile Wed Jun 4 22:38:24 2014 (r356553) @@ -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> Modified: head/devel/statsvn/pkg-plist ============================================================================== --- head/devel/statsvn/pkg-plist Wed Jun 4 22:10:18 2014 (r356552) +++ head/devel/statsvn/pkg-plist Wed Jun 4 22:38:24 2014 (r356553) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406042238.s54McOI1057753>