From owner-svn-ports-all@FreeBSD.ORG Wed Jun 4 22:38:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E6C0C33; Wed, 4 Jun 2014 22:38:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3BA6C2C61; Wed, 4 Jun 2014 22:38:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54McPZM057757; Wed, 4 Jun 2014 22:38:25 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s54McOI1057753; Wed, 4 Jun 2014 22:38:24 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201406042238.s54McOI1057753@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 4 Jun 2014 22:38:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356553 - in head/devel: statcvs statsvn X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 22:38:26 -0000 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 + +.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 +.include 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 + +.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 +.include 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