From owner-svn-ports-all@freebsd.org Sat Apr 2 02:53:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A712B0023B; Sat, 2 Apr 2016 02:53:46 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E6C8711BA; Sat, 2 Apr 2016 02:53:45 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u322rjcm005462; Sat, 2 Apr 2016 02:53:45 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u322rjBW005461; Sat, 2 Apr 2016 02:53:45 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604020253.u322rjBW005461@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 2 Apr 2016 02:53:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412379 - head/textproc/saxon 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.21 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, 02 Apr 2016 02:53:46 -0000 Author: amdmi3 Date: Sat Apr 2 02:53:44 2016 New Revision: 412379 URL: https://svnweb.freebsd.org/changeset/ports/412379 Log: - Add NO_ARCH - Switch to options helpers - Simplify installation Modified: head/textproc/saxon/Makefile Modified: head/textproc/saxon/Makefile ============================================================================== --- head/textproc/saxon/Makefile Sat Apr 2 01:52:30 2016 (r412378) +++ head/textproc/saxon/Makefile Sat Apr 2 02:53:44 2016 (r412379) @@ -17,13 +17,12 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ NO_WRKSUBDIR= yes NO_BUILD= yes +NO_ARCH= yes CONFLICTS= saxon-devel-8.* -OPTIONS_DEFINE= DOCS EXAMPLES - JARFILES= saxon-jdom.jar saxon.jar -PLIST_FILES+= ${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon +PLIST_FILES= ${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon PORTDOCS= api api-guide.html changes.html conditions.html \ conformance.html dtdgen.html expressions.html \ extensibility.html extensions.html index.html \ @@ -33,25 +32,18 @@ PORTDOCS= api api-guide.html changes.htm SUB_LIST= SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}" SUB_FILES= saxon.sh +OPTIONS_DEFINE= DOCS EXAMPLES + do-install: - @${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}..." .for JARFILE in ${JARFILES} - @${ECHO_MSG} -n " ${JARFILE}" ${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/ .endfor - @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..." - (cd ${WRKSRC}/samples/ && \ - ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; && \ - ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;) - @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - (cd ${WRKSRC}/doc/ && \ - ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; && \ - ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;) - @${ECHO_MSG} " [ DONE ]" - @${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin..." ${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/saxon - @${ECHO_MSG} " [ DONE ]" + +do-install-DOCS-on: + @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: + @cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include