From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 31 15:23:15 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 94B4DCAB;
 Mon, 31 Mar 2014 15:23:15 +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 80FB3C99;
 Mon, 31 Mar 2014 15:23:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VFNFaw045054;
 Mon, 31 Mar 2014 15:23:15 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VFNF8V045053;
 Mon, 31 Mar 2014 15:23:15 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201403311523.s2VFNF8V045053@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Mon, 31 Mar 2014 15:23:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349764 - head/devel/jakarta-commons-modeler
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.17
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: Mon, 31 Mar 2014 15:23:15 -0000

Author: pawel
Date: Mon Mar 31 15:23:14 2014
New Revision: 349764
URL: http://svnweb.freebsd.org/changeset/ports/349764
QAT: https://qat.redports.org/buildarchive/r349764/

Log:
  - Add staging support
  - Define DOCS option

Modified:
  head/devel/jakarta-commons-modeler/Makefile

Modified: head/devel/jakarta-commons-modeler/Makefile
==============================================================================
--- head/devel/jakarta-commons-modeler/Makefile	Mon Mar 31 15:12:38 2014	(r349763)
+++ head/devel/jakarta-commons-modeler/Makefile	Mon Mar 31 15:23:14 2014	(r349764)
@@ -16,28 +16,16 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
+PORTDOCS=	*
 
-do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [ DONE ]"
+OPTIONS_DEFINE=	DOCS
 
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/docs \
-	 && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/docs/{} \; \
-	 && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/docs/{} \;
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/NOTICE.txt ${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/RELEASE-NOTES.txt ${DOCSDIR}/
-	@${ECHO_MSG} " [ DONE ]"
-.endif
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \
+		RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>