svn commit: r356104 - head/lang/jakarta-commons-jelly

[Pawel Pekala]

Author: pawel
Date: Sun Jun  1 11:49:31 2014
New Revision: 356104
URL: http://svnweb.freebsd.org/changeset/ports/356104
QAT: https://qat.redports.org/buildarchive/r356104/

Log:
  - Add staging support
  - Convert to new options framework
  - Drop RUN_DEPENDS on javavmwrapper, pulled in by java port
  - Use PORDATA instead of generated plist
  - Fix WWW line

Modified:
  head/lang/jakarta-commons-jelly/Makefile
  head/lang/jakarta-commons-jelly/pkg-descr

Modified: head/lang/jakarta-commons-jelly/Makefile
==============================================================================
--- head/lang/jakarta-commons-jelly/Makefile	Sun Jun  1 11:47:40 2014	(r356103)
+++ head/lang/jakarta-commons-jelly/Makefile	Sun Jun  1 11:49:31 2014	(r356104)
@@ -12,42 +12,28 @@ PKGNAMEPREFIX=	jakarta-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	XML based scripting engine
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 READMES=	LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
-DATAFILES=	custom lib bin
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
 
 SUB_FILES=	jelly.sh
 PLIST_FILES=	bin/jelly
+PORTDOCS=	*
+PORTDATA=	*
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-extract:
 	${RM} -f ${WRKSRC}/bin/jelly.bat ${WRKSRC}/bin/jelly
 
 do-install:
-	cd ${WRKSRC} && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} ";"
-	cd ${WRKSRC} && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} ";"
-	${INSTALL_SCRIPT} ${WRKDIR}/jelly.sh ${PREFIX}/bin/jelly
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
-	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";"
-	${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${DOCSDIR}/
-.endif
-
-post-install:
-	@${FIND} -s ${DATAFILES:S,^,${WRKSRC}/,} -not -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${DATAFILES:S,^,${WRKSRC}/,} -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC}, at dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${ECHO_CMD} '@dirrm ${DATADIR:S,^${PREFIX}/,,}' >> ${TMPPLIST}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "custom lib bin" \
+		${STAGEDIR}${DATADIR})
+	${INSTALL_SCRIPT} ${WRKDIR}/jelly.sh ${STAGEDIR}${PREFIX}/bin/jelly
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${READMES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/lang/jakarta-commons-jelly/pkg-descr
==============================================================================
--- head/lang/jakarta-commons-jelly/pkg-descr	Sun Jun  1 11:47:40 2014	(r356103)
+++ head/lang/jakarta-commons-jelly/pkg-descr	Sun Jun  1 11:49:31 2014	(r356104)
@@ -12,4 +12,4 @@ dynamic web site generation. A single Je
 transform XML events. This leads to a powerful XML pipeline engine similar in
 some ways to Cocoon.
 
-WWW:	http://jakarta.apache.org/commons/jelly/index.html
+WWW: http://jakarta.apache.org/commons/jelly/index.html