From owner-svn-ports-all@FreeBSD.ORG Sat Jan 25 17:38:06 2014 Return-Path: Delivered-To: svn-ports-all@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 4000E304; Sat, 25 Jan 2014 17:38:06 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13AE212DB; Sat, 25 Jan 2014 17:38:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PHc5AB016537; Sat, 25 Jan 2014 17:38:05 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PHc5Ok016536; Sat, 25 Jan 2014 17:38:05 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401251738.s0PHc5Ok016536@svn.freebsd.org> From: Antoine Brodin Date: Sat, 25 Jan 2014 17:38:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341065 - head/textproc/nux X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 17:38:06 -0000 Author: antoine Date: Sat Jan 25 17:38:05 2014 New Revision: 341065 URL: http://svnweb.freebsd.org/changeset/ports/341065 QAT: https://qat.redports.org/buildarchive/r341065/ Log: - Fix a broken RUN_DEPENDS - While here, add stage support Modified: head/textproc/nux/Makefile Modified: head/textproc/nux/Makefile ============================================================================== --- head/textproc/nux/Makefile Sat Jan 25 17:37:38 2014 (r341064) +++ head/textproc/nux/Makefile Sat Jan 25 17:38:05 2014 (r341065) @@ -23,12 +23,10 @@ JAVA_VERSION= 1.6+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes -.include .include .if ${PORT_OPTIONS:MXQUERY_TOOL} -RUN_DEPENDS+= ${JAVALIBDIR}/getopt.jar:${PORTSDIR}/java/java-getopt \ +RUN_DEPENDS+= ${JAVALIBDIR}/java-getopt.jar:${PORTSDIR}/java/java-getopt \ classpath:${PORTSDIR}/java/javavmwrapper .endif @@ -46,20 +44,14 @@ SUB_FILES= fire-xquery.sh .endif do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${MKDIR} ${JAVAJARDIR} - @${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${JAVAJARDIR}/ - @${ECHO_MSG} " [ DONE ]" + @${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR} .if ${PORT_OPTIONS:MXQUERY_TOOL} - @${ECHO_MSG} -n ">> Installing XQuery command-line tool as ${PREFIX}/bin/fire-xquery..." - @${INSTALL_SCRIPT} ${WRKDIR}/fire-xquery.sh ${PREFIX}/bin/fire-xquery - @${ECHO_MSG} " [ DONE ]" + ${INSTALL_SCRIPT} ${WRKDIR}/fire-xquery.sh ${STAGEDIR}${PREFIX}/bin/fire-xquery .endif .if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @cd ${WRKSRC}/doc/ && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; - @cd ${WRKSRC}/doc/ && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; - @${ECHO_MSG} " [ DONE ]" + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} .endif -.include +.include