- Add staging support

- Define DOCS option
- Fix WWW line in pkg-descr

2 files changed, 7 insertions, 21 deletions

diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index ec614281d35a..a2042495797a 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -15,28 +15,14 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	ch01.html ch01s02.html ch02.html ch03.html ch03s02.html \
-		ch03s03.html ch03s04.html ch03s05.html ch03s06.html \
-		ch03s07.html ch03s08.html ch03s09.html ch04.html ch04s02.html \
-		ch04s03.html ch04s04.html ch04s05.html ch05.html ch06.html \
-		ch07.html ch08.html ch09.html ch10.html ch11.html ch12.html \
-		ch13.html ch14.html ch15.html ch16.html index.html javadoc \
-		manual.css pr01.html
-.endif
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/doc/ \
-	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
-.endif
+	${INSTALL_DATA} ${WRKSRC}/lib/${DISTNAME}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/jsap/pkg-descr b/devel/jsap/pkg-descr
index 08bd8b969a4f..e0175d9fe629 100644
--- a/devel/jsap/pkg-descr
+++ b/devel/jsap/pkg-descr
@@ -9,4 +9,4 @@ successfully parsed, you are guaranteed an Integer when you request that
 parameter's value from your program. There's a pretty big (and growing) list of
 return types supported by JSAP.
 
-WWW:	http://www.martiansoftware.com/jsap/index.html
+WWW: http://www.martiansoftware.com/jsap/index.html