From owner-svn-ports-all@FreeBSD.ORG  Fri May 30 18:02:04 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 6207FA92;
 Fri, 30 May 2014 18:02:04 +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 4FBDF20CD;
 Fri, 30 May 2014 18:02:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UI24Ve095107;
 Fri, 30 May 2014 18:02:04 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UI246O095106;
 Fri, 30 May 2014 18:02:04 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405301802.s4UI246O095106@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 30 May 2014 18:02:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355885 - head/java/jakarta-commons-cli
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 May 2014 18:02:04 -0000

Author: pawel
Date: Fri May 30 18:02:03 2014
New Revision: 355885
URL: http://svnweb.freebsd.org/changeset/ports/355885
QAT: https://qat.redports.org/buildarchive/r355885/

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

Modified:
  head/java/jakarta-commons-cli/Makefile

Modified: head/java/jakarta-commons-cli/Makefile
==============================================================================
--- head/java/jakarta-commons-cli/Makefile	Fri May 30 17:49:55 2014	(r355884)
+++ head/java/jakarta-commons-cli/Makefile	Fri May 30 18:02:03 2014	(r355885)
@@ -24,24 +24,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-DOC_FILES=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-.endif
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@-${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${DOCSDIR}
-.for f in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.endfor
-	@${ECHO_MSG} " [ DONE ]"
-.endif
+	${INSTALL_DATA} ${WRKSRC}/${JARFILE} \
+		${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \
+		RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>