Date: Sat, 31 May 2014 11:50:14 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355963 - head/java/jakarta-regexp Message-ID: <201405311150.s4VBoEJx075761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Sat May 31 11:50:14 2014 New Revision: 355963 URL: http://svnweb.freebsd.org/changeset/ports/355963 QAT: https://qat.redports.org/buildarchive/r355963/ Log: - Add staging support - Convert to new options framework - USE_ANT, ALL_TARGET, MAKE_ARGS instead of custom do-build target - Use PLIST_FILES and not generated plist file Modified: head/java/jakarta-regexp/Makefile Modified: head/java/jakarta-regexp/Makefile ============================================================================== --- head/java/jakarta-regexp/Makefile Sat May 31 11:47:32 2014 (r355962) +++ head/java/jakarta-regexp/Makefile Sat May 31 11:50:14 2014 (r355963) @@ -11,44 +11,24 @@ MASTER_SITE_SUBDIR= regexp/binaries MAINTAINER= ports@FreeBSD.org COMMENT= Regular expressions for Java -BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant - USE_JAVA= yes JAVA_VERSION= 1.6+ - -PLIST= ${WRKDIR}/PLIST +USE_ANT= yes +ALL_TARGET= test package +MAKE_ARGS= -Djakarta-site.dir=${WRKSRC} JAVALIBNAME= ${PORTNAME}-${PORTVERSION} -.if !defined(NOPORTDOCS) +PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar PORTDOCS= * -.endif -NO_STAGE= yes -do-build: - @if [ ! -f ${WRKSRC}/lib ]; then ${MKDIR} ${WRKSRC}/lib; fi - @cd ${WRKSRC} && \ - ${SETENV} JAVA_HOME=${JAVA_HOME} ant -Djakarta-site.dir=${WRKSRC} test package - -pre-install: - @${RM} -f ${PLIST} - @${TOUCH} ${PLIST} - @${ECHO} ${JAVAJARDIR}/${PORTNAME}.jar | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - @${ECHO} "@unexec ${RMDIR} ${JAVAJARDIR} 2>/dev/null || true" | \ - ${SED} "s,${PREFIX}/*,," >> ${PLIST} - -do-install: do-install-jar do-install-apidocs - -do-install-jar: - @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar - -do-install-apidocs: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${CP} -r ${WRKSRC}/docs/api/* ${DOCSDIR} - @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} -.endif +OPTIONS_DEFINE= DOCS + +do-install: + @${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \ + ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/docs/api && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405311150.s4VBoEJx075761>