From owner-svn-ports-all@FreeBSD.ORG  Sat May 31 14:53:53 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 E83451E3;
 Sat, 31 May 2014 14:53:53 +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 BBD242FBA;
 Sat, 31 May 2014 14:53:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VErrHS058066;
 Sat, 31 May 2014 14:53:53 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VErrZQ058064;
 Sat, 31 May 2014 14:53:53 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405311453.s4VErrZQ058064@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 31 May 2014 14:53:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355986 - head/java/netrexx
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: Sat, 31 May 2014 14:53:54 -0000

Author: pawel
Date: Sat May 31 14:53:53 2014
New Revision: 355986
URL: http://svnweb.freebsd.org/changeset/ports/355986
QAT: https://qat.redports.org/buildarchive/r355986/

Log:
  - Add staging support
  - Convert to new options framework, add EXAMPLES option

Modified:
  head/java/netrexx/Makefile
  head/java/netrexx/pkg-plist

Modified: head/java/netrexx/Makefile
==============================================================================
--- head/java/netrexx/Makefile	Sat May 31 14:53:09 2014	(r355985)
+++ head/java/netrexx/Makefile	Sat May 31 14:53:53 2014	(r355986)
@@ -15,8 +15,7 @@ NO_BUILD=	yes
 USES=		zip
 USE_JAVA=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 pre-patch:
 	for file in ${WRKSRC}/bin/NetRexxC.sh ${WRKSRC}/read.me.first; do \
@@ -30,21 +29,13 @@ post-patch:
 	                 ${WRKSRC}/bin/NetRexxC.sh
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/NetRexxC.sh ${PREFIX}/bin
-	@${LN} -sf ${PREFIX}/bin/NetRexxC.sh ${PREFIX}/bin/nrc
-
-	@${INSTALL_DATA} ${WRKSRC}/lib/NetRexxC.jar ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/runlib/NetRexxR.jar ${JAVAJARDIR}
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx \
-		${EXAMPLESDIR}
-	@cd ${WRKSRC}/browse && \
-		${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
-	@cd ${WRKSRC}/browse && \
-		${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/NetRexxC.sh ${STAGEDIR}${PREFIX}/bin
+	${LN} -sf ${PREFIX}/bin/NetRexxC.sh ${STAGEDIR}${PREFIX}/bin/nrc
+	${INSTALL_DATA} ${WRKSRC}/lib/NetRexxC.jar ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/runlib/NetRexxR.jar ${STAGEDIR}${JAVAJARDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/browse && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install:
 	@${ECHO} "====================  IBM LICENSE  ===================="
@@ -53,4 +44,4 @@ post-install:
 	@${ECHO} "====================  IMPORTANT!!  ===================="
 	@${CAT} ${WRKSRC}/read.me.first
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/java/netrexx/pkg-plist
==============================================================================
--- head/java/netrexx/pkg-plist	Sat May 31 14:53:09 2014	(r355985)
+++ head/java/netrexx/pkg-plist	Sat May 31 14:53:53 2014	(r355986)
@@ -129,10 +129,10 @@ bin/nrc
 %%PORTDOCS%%%%DOCSDIR%%/ArchText.nrx
 %%PORTDOCS%%%%DOCSDIR%%/wordclock.html
 %%PORTDOCS%%%%DOCSDIR%%/ArchText.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/hello.nrx
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.nrx
 %%JAVAJARDIR%%/NetRexxC.jar
 %%JAVAJARDIR%%/NetRexxR.jar
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx/lang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/netrexx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%