From owner-svn-ports-head@FreeBSD.ORG Mon Mar 31 10:50:15 2014 Return-Path: Delivered-To: svn-ports-head@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 4FB10DC8; Mon, 31 Mar 2014 10:50:15 +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 328FF9AA; Mon, 31 Mar 2014 10:50:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VAoF5g029523; Mon, 31 Mar 2014 10:50:15 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VAoFhC029522; Mon, 31 Mar 2014 10:50:15 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201403311050.s2VAoFhC029522@svn.freebsd.org> From: Pawel Pekala Date: Mon, 31 Mar 2014 10:50:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349721 - head/devel/fujaba X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Mar 2014 10:50:15 -0000 Author: pawel Date: Mon Mar 31 10:50:14 2014 New Revision: 349721 URL: http://svnweb.freebsd.org/changeset/ports/349721 QAT: https://qat.redports.org/buildarchive/r349721/ Log: - Add staging support - Remove run dependency on javavmwrapper, it's pulled in by openjdk - Use PORTDATA instead of TMPPLIST hacks for plist creation - Define DOCS option Modified: head/devel/fujaba/Makefile Modified: head/devel/fujaba/Makefile ============================================================================== --- head/devel/fujaba/Makefile Mon Mar 31 10:36:02 2014 (r349720) +++ head/devel/fujaba/Makefile Mon Mar 31 10:50:14 2014 (r349721) @@ -11,49 +11,36 @@ DISTNAME= FujabaToolSuite_Developer${POR MAINTAINER= ports@FreeBSD.org COMMENT= Another UML CASE tool -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/Fujaba\ Tool\ Suite\ ${PORTVERSION} -DATAFILES= DTDs Templates libs plugins stylesheets\ - GNULesserGeneralPublicLicense.txt api.zip fujaba.jar src.jar - -PLIST_FILES= bin/fujaba %%DATADIR%%/bin/fujaba.sh +DATADIRS= DTDs Templates libs plugins stylesheets +DATAFILES= GNULesserGeneralPublicLicense.txt api.zip fujaba.jar src.jar -.if !defined(NOPORTDOCS) +PLIST_FILES= bin/fujaba +PORTDATA= * PORTDOCS= * -PLIST_FILES+= %%DATADIR%%/doc -.endif SUB_FILES= fujaba.sh SUB_LIST= LOCALBASE="${LOCALBASE}" DATADIR="${DATADIR}" -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + +.include + do-install: - ${MKDIR} ${DATADIR}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/fujaba.sh ${DATADIR}/bin/ - ${LN} -s ${DATADIR}/bin/fujaba.sh ${PREFIX}/bin/fujaba - cd ${WRKSRC}/ \ - && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \ - && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \; -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${LN} -s ${DOCSDIR} ${DATADIR}/doc - cd ${WRKSRC}/doc/ \ - && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; + @${MKDIR} ${STAGEDIR}${DATADIR}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/fujaba.sh ${STAGEDIR}${DATADIR}/bin + ${LN} -s ${DATADIR}/bin/fujaba.sh ${STAGEDIR}${PREFIX}/bin/fujaba + (cd ${WRKSRC} && ${COPYTREE_SHARE} "${DATADIRS}" ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${DATAFILES} ${STAGEDIR}${DATADIR}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) +.if ${PORT_OPTIONS:MDOCS} + ${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/doc .endif -post-install: - @${FIND} -s ${DATAFILES:S,^,${WRKSRC}/,} -not -type d \ - | ${SED} -ne 's,^${WRKSRC},${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST} - @${FIND} -s -d ${DATAFILES:S,^,${WRKSRC}/,} -type d \ - | ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}/bin" >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >> ${TMPPLIST} - .include