From owner-svn-ports-all@FreeBSD.ORG Sat May 31 12:48:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB2D4F6B; Sat, 31 May 2014 12:48:50 +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 BE5B02676; Sat, 31 May 2014 12:48:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VCmoSg000382; Sat, 31 May 2014 12:48:50 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VCmoeT000381; Sat, 31 May 2014 12:48:50 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201405311248.s4VCmoeT000381@svn.freebsd.org> From: Pawel Pekala Date: Sat, 31 May 2014 12:48:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355967 - head/java/java-checkstyle 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: Sat, 31 May 2014 12:48:51 -0000 Author: pawel Date: Sat May 31 12:48:50 2014 New Revision: 355967 URL: http://svnweb.freebsd.org/changeset/ports/355967 QAT: https://qat.redports.org/buildarchive/r355967/ Log: - Add staging support - Convert to new options framework - Remove RUN_DEPENDS on javavmwrapper, it's pulled in by java port Modified: head/java/java-checkstyle/Makefile Modified: head/java/java-checkstyle/Makefile ============================================================================== --- head/java/java-checkstyle/Makefile Sat May 31 12:26:06 2014 (r355966) +++ head/java/java-checkstyle/Makefile Sat May 31 12:48:50 2014 (r355967) @@ -11,8 +11,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ports@FreeBSD.org COMMENT= Java style checker -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes @@ -22,35 +20,27 @@ JAR_FILE= ${PORTNAME}-${PORTVERSION}-all PLIST_FILES= bin/${PORTNAME} \ %%JAVAJARDIR%%/${PORTNAME}.jar - -.if !defined(NOPORTDOCS) PORTDOCS= * -.endif - -.if !defined(NOPORTEXAMPLES) PORTEXAMPLES= * -.endif SUB_FILES= ${PORTNAME}.sh -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + do-install: - @-${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/${JAR_FILE} ${JAVAJARDIR}/${PORTNAME}.jar - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME} -.if !defined(NOPORTDOCS) - @-${MKDIR} ${DOCSDIR} -.for DOCFILE in LICENSE* README RIGHTS.antlr - @${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}/ -.endfor - @cd ${WRKSRC} && ${COPYTREE_SHARE} site ${DOCSDIR} -.endif -.if !defined(NOPORTEXAMPLES) - @-${MKDIR} ${EXAMPLESDIR} + @-${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/${JAR_FILE} \ + ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @-${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE* README RIGHTS.antlr \ + ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} site ${STAGEDIR}${DOCSDIR}) + @-${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for EXAMPLEFILE in checkstyle_checks import-control sun_checks suppressions - @${INSTALL_DATA} ${WRKSRC}/${EXAMPLEFILE}.xml ${EXAMPLESDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${EXAMPLEFILE}.xml ${STAGEDIR}${EXAMPLESDIR} .endfor - @cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${EXAMPLESDIR} -.endif + (cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${EXAMPLESDIR}) .include