From owner-svn-ports-head@FreeBSD.ORG Sat May 31 11:08:34 2014 Return-Path: Delivered-To: svn-ports-head@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 EBA23BA4; Sat, 31 May 2014 11:08:34 +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 BF2C82EF1; Sat, 31 May 2014 11:08:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VB8YQo056081; Sat, 31 May 2014 11:08:34 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VB8YV0056080; Sat, 31 May 2014 11:08:34 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201405311108.s4VB8YV0056080@svn.freebsd.org> From: Pawel Pekala Date: Sat, 31 May 2014 11:08:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355959 - head/java/jakarta-oro 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.18 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: Sat, 31 May 2014 11:08:35 -0000 Author: pawel Date: Sat May 31 11:08:34 2014 New Revision: 355959 URL: http://svnweb.freebsd.org/changeset/ports/355959 QAT: https://qat.redports.org/buildarchive/r355959/ Log: - Add staging support - Convert to new options framework - USE_ANT, ALL_TARGET instead of custom do-build target - Use PLIST_FILES and not generated plist file Modified: head/java/jakarta-oro/Makefile Modified: head/java/jakarta-oro/Makefile ============================================================================== --- head/java/jakarta-oro/Makefile Sat May 31 10:57:17 2014 (r355958) +++ head/java/jakarta-oro/Makefile Sat May 31 11:08:34 2014 (r355959) @@ -10,43 +10,23 @@ MASTER_SITES= http://archive.apache.org/ MAINTAINER= ports@FreeBSD.org COMMENT= Perl/awk/sh regular expressions for Java -BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant - USE_JAVA= yes +USE_ANT= yes JAVA_VERSION= 1.6+ - -PLIST= ${WRKDIR}/PLIST +ALL_TARGET= jar javadocs JAVALIBNAME= ${PORTNAME}-${PORTVERSION} -.if !defined(NOPORTDOCS) +PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar PORTDOCS= * -.endif -NO_STAGE= yes -do-build: - @cd ${WRKSRC} && \ - ${SETENV} JAVA_HOME=${JAVA_HOME} ant jar javadocs - -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