Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Apr 2016 02:53:45 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412379 - head/textproc/saxon
Message-ID:  <201604020253.u322rjBW005461@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604020253.u322rjBW005461>