Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Mar 2014 16:15:45 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349769 - head/devel/jsap
Message-ID:  <201403311615.s2VGFjDq065845@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Mar 31 16:15:44 2014
New Revision: 349769
URL: http://svnweb.freebsd.org/changeset/ports/349769
QAT: https://qat.redports.org/buildarchive/r349769/

Log:
  - Add staging support
  - Define DOCS option
  - Fix WWW line in pkg-descr

Modified:
  head/devel/jsap/Makefile
  head/devel/jsap/pkg-descr

Modified: head/devel/jsap/Makefile
==============================================================================
--- head/devel/jsap/Makefile	Mon Mar 31 16:09:32 2014	(r349768)
+++ head/devel/jsap/Makefile	Mon Mar 31 16:15:44 2014	(r349769)
@@ -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>

Modified: head/devel/jsap/pkg-descr
==============================================================================
--- head/devel/jsap/pkg-descr	Mon Mar 31 16:09:32 2014	(r349768)
+++ head/devel/jsap/pkg-descr	Mon Mar 31 16:15:44 2014	(r349769)
@@ -9,4 +9,4 @@ successfully parsed, you are guaranteed 
 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



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