Date: Sun, 26 Jan 2014 21:01:25 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341286 - head/textproc/fop Message-ID: <201401262101.s0QL1Pf2031886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sun Jan 26 21:01:24 2014 New Revision: 341286 URL: http://svnweb.freebsd.org/changeset/ports/341286 QAT: https://qat.redports.org/buildarchive/r341286/ Log: Convert to staging. Sponsored by: Absolight Modified: head/textproc/fop/Makefile head/textproc/fop/pkg-plist Modified: head/textproc/fop/Makefile ============================================================================== --- head/textproc/fop/Makefile Sun Jan 26 20:51:45 2014 (r341285) +++ head/textproc/fop/Makefile Sun Jan 26 21:01:24 2014 (r341286) @@ -16,8 +16,11 @@ COMMENT= Print formatter driven by XSL f EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip +OPTIONS_DEFINE= DOCS + WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} DATADIR= ${JAVASHAREDIR}/${PORTNAME} +PORTDOCS= * USE_JAVA= yes JAVA_VERSION= 1.6+ @@ -26,27 +29,24 @@ USE_ANT= yes # Prevent out of memory error during build MAKE_ENV+= "ANT_OPTS=-Xmx512m" -NO_STAGE= yes post-extract: @cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation_v2.0.zip @${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${WRKSRC}/hyph do-install: .for d in build conf lib - @${MKDIR} ${DATADIR}/${d} + @${MKDIR} ${STAGEDIR}${DATADIR}/${d} .endfor @cd ${WRKSRC} && \ - ${INSTALL_DATA} status.xml ${DATADIR}/ && \ - ${INSTALL_DATA} build/*.[jw]ar ${DATADIR}/build/ && \ - ${INSTALL_DATA} lib/*.jar lib/README.txt ${DATADIR}/lib/ && \ - ${INSTALL_DATA} conf/fop.xconf ${DATADIR}/conf/ && \ - ${COPYTREE_SHARE} hyph ${DATADIR}/ - @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${DATADIR}/ - @${LN} -s ${DATADIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_MAN} LICENSE README NOTICE KEYS ${DOCSDIR} -.endif + ${INSTALL_DATA} status.xml ${STAGEDIR}${DATADIR} && \ + ${INSTALL_DATA} build/*.[jw]ar ${STAGEDIR}${DATADIR}/build && \ + ${INSTALL_DATA} lib/*.jar lib/README.txt ${STAGEDIR}${DATADIR}/lib && \ + ${INSTALL_DATA} conf/fop.xconf ${STAGEDIR}${DATADIR}/conf && \ + ${COPYTREE_SHARE} hyph ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} + ${LN} -s ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_MAN} LICENSE README NOTICE KEYS ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/textproc/fop/pkg-plist ============================================================================== --- head/textproc/fop/pkg-plist Sun Jan 26 20:51:45 2014 (r341285) +++ head/textproc/fop/pkg-plist Sun Jan 26 21:01:24 2014 (r341286) @@ -86,13 +86,8 @@ bin/fop %%DATADIR%%/lib/xml-apis-1.3.04.jar %%DATADIR%%/lib/xml-apis-ext-1.3.04.jar %%DATADIR%%/lib/xmlgraphics-commons-1.5.jar -%%PORTDOCS%%%%DOCSDIR%%/KEYS -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/NOTICE -%%PORTDOCS%%%%DOCSDIR%%/README @dirrm %%DATADIR%%/lib @dirrm %%DATADIR%%/hyph @dirrm %%DATADIR%%/conf @dirrm %%DATADIR%%/build @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401262101.s0QL1Pf2031886>