Date: Mon, 10 Feb 2014 16:35:51 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343651 - head/java/bouncycastle Message-ID: <201402101635.s1AGZpYD008084@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Mon Feb 10 16:35:51 2014 New Revision: 343651 URL: http://svnweb.freebsd.org/changeset/ports/343651 QAT: https://qat.redports.org/buildarchive/r343651/ Log: Fix build with java7 and stagify. Modified: head/java/bouncycastle/Makefile Modified: head/java/bouncycastle/Makefile ============================================================================== --- head/java/bouncycastle/Makefile Mon Feb 10 16:32:40 2014 (r343650) +++ head/java/bouncycastle/Makefile Mon Feb 10 16:35:51 2014 (r343651) @@ -19,10 +19,12 @@ BUILD_DEPENDS= ${JAVALIBDIR}/activation. RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf \ ${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail +OPTIONS_DEFINE= DOCS + USE_JAVA= yes JAVA_VERSION= 1.6+ -JDKMVERSION= ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/} -JDKNVERSION= ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/} +JDKMVERSION= 1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/} +JDKNVERSION= 16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/} USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES MAKE_ARGS= -f jdk${JDKNVERSION}.xml @@ -35,29 +37,28 @@ PORTDOCS= * PORTSCOUT= skipv:146 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} s/BERConstructedOctetString/DEROctetString/ \ ${WRKSRC}/src/org/bouncycastle/cms/CMS*DataGenerator.java + @${REINPLACE_CMD} 's/<javac/<javac encoding="UTF-8"/;s/<javadoc/<javadoc encoding="UTF-8"/' \ + ${WRKSRC}/bc-build.xml ${WRKSRC}/common.xml do-install: - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} .for jar in ${JARS} ${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}-${DISTVERSION}.jar \ - ${JAVAJARDIR}/${jar}.jar + ${STAGEDIR}${JAVAJARDIR}/${jar}.jar ${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/src.zip \ - ${DATADIR}/${jar}-src.zip + ${STAGEDIR}${DATADIR}/${jar}-src.zip .endfor ${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}-${DISTVERSION}.jar \ - ${JAVAJARDIR}/bcprov.jar -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR} + ${STAGEDIR}${JAVAJARDIR}/bcprov.jar + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} .for jar in ${JARS} - @${MKDIR} ${DOCSDIR}/${jar} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar} @cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/docs/ && \ - ${COPYTREE_SHARE} . ${DOCSDIR}/${jar} + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar} .endfor -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402101635.s1AGZpYD008084>