From owner-svn-ports-head@FreeBSD.ORG  Sat May 31 14:08:40 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6FD9B1FB;
 Sat, 31 May 2014 14:08:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 5D4192C31;
 Sat, 31 May 2014 14:08:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VE8eh3036271;
 Sat, 31 May 2014 14:08:40 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VE8eNA036270;
 Sat, 31 May 2014 14:08:40 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405311408.s4VE8eNA036270@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 31 May 2014 14:08:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355978 - head/java/jta
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2014 14:08:40 -0000

Author: pawel
Date: Sat May 31 14:08:39 2014
New Revision: 355978
URL: http://svnweb.freebsd.org/changeset/ports/355978
QAT: https://qat.redports.org/buildarchive/r355978/

Log:
  - Add staging support
  - Convert to new options framework

Modified:
  head/java/jta/Makefile

Modified: head/java/jta/Makefile
==============================================================================
--- head/java/jta/Makefile	Sat May 31 14:04:01 2014	(r355977)
+++ head/java/jta/Makefile	Sat May 31 14:08:39 2014	(r355978)
@@ -18,26 +18,21 @@ NO_BUILD=	yes
 NO_CDROM=	See the license
 DOWNLOAD_URL=	http://download.oracle.com/otndocs/jcp/7286-jta-${PORTVERSION}-spec-oth-JSpec/?submit=Download
 
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 PORTDOCS=	${DISTNAME}.pdf javadocs
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 IGNORE=		you must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
 .endif
 
 do-install:
-	@${ECHO_MSG} -n ">> Install JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
-	@${ECHO_MSG} " [ DONE ]"
-.endif
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/${DISTNAME}.pdf ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} javadocs ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>