From owner-svn-ports-all@FreeBSD.ORG  Sat Mar 16 07:29:23 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 208BDD67;
 Sat, 16 Mar 2013 07:29:23 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 12132619;
 Sat, 16 Mar 2013 07:29:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2G7TMcK058517;
 Sat, 16 Mar 2013 07:29:22 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2G7TM36058516;
 Sat, 16 Mar 2013 07:29:22 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303160729.r2G7TM36058516@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sat, 16 Mar 2013 07:29:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314337 - head/java/berkeley-db
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.14
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, 16 Mar 2013 07:29:23 -0000

Author: jgh
Date: Sat Mar 16 07:29:22 2013
New Revision: 314337
URL: http://svnweb.freebsd.org/changeset/ports/314337

Log:
  - adopt optionsNG
  - cleanup of EXAMPLES and unconditionally assign PORTDOCS
  
  Approved by:	portmgr (miwi)

Modified:
  head/java/berkeley-db/Makefile

Modified: head/java/berkeley-db/Makefile
==============================================================================
--- head/java/berkeley-db/Makefile	Sat Mar 16 06:47:21 2013	(r314336)
+++ head/java/berkeley-db/Makefile	Sat Mar 16 07:29:22 2013	(r314337)
@@ -12,7 +12,7 @@ MASTER_SITES=	http://download.oracle.com
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Berkeley DB Java Edition
 
-OPTIONS=	TEST "Run the self-tests after building automatically" off
+OPTIONS_DEFINE=	TEST
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
@@ -25,9 +25,8 @@ USE_DOS2UNIX=	build.xml
 
 PLIST_FILES=	%%JAVAJARDIR%%/je.jar
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
+PORTEXAMPLES=	*
 
 test:
 	#
@@ -41,9 +40,9 @@ test:
 		${FALSE} ; \
 	fi
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_TEST)
+.if ${PORT_OPTIONS:MTEST}
 post-build:	test
 	#
 	# Please, review the reported failures (if any) and consider
@@ -68,17 +67,13 @@ post-patch:
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/build/lib/je.jar ${JAVAJARDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${CP} -R ${WRKSRC}/docs/ ${DOCSDIR}
+	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
-
-post-install:
-	@${FIND} ${EXAMPLESDIR} ! -type d | \
-		${SED} -e "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} -e "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \*  ${EXAMPLESDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>