From owner-svn-ports-head@FreeBSD.ORG  Sat May 31 14:03:08 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7953CE8E;
 Sat, 31 May 2014 14:03:08 +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 4CD9D2BEC;
 Sat, 31 May 2014 14:03:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VE38r3035252;
 Sat, 31 May 2014 14:03:08 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VE38og035251;
 Sat, 31 May 2014 14:03:08 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405311403.s4VE38og035251@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 31 May 2014 14:03:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355976 - head/java/jdom
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:03:08 -0000

Author: pawel
Date: Sat May 31 14:03:07 2014
New Revision: 355976
URL: http://svnweb.freebsd.org/changeset/ports/355976
QAT: https://qat.redports.org/buildarchive/r355976/

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

Modified:
  head/java/jdom/Makefile

Modified: head/java/jdom/Makefile
==============================================================================
--- head/java/jdom/Makefile	Sat May 31 14:01:00 2014	(r355975)
+++ head/java/jdom/Makefile	Sat May 31 14:03:07 2014	(r355976)
@@ -15,46 +15,35 @@ RUN_DEPENDS=	${JAVALIBDIR}/jaxen-jdom.ja
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
-
 ALL_TARGET=	package
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-OTHERDOCS=	README.txt TODO.txt CHANGES.txt COMMITTERS.txt LICENSE.txt
-PORTDOCS=	apidocs ${OTHERDOCS}
-.endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_ENV+=	CLASSPATH=${JAVALIBDIR}/jaxen-jdom.jar
 
 PLIST_FILES=	%%JAVAJARDIR%%/jdom.jar
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-NO_STAGE=	yes
-do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/jdom.jar..."
-	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/build/jdom.jar ${JAVAJARDIR}/
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}/build/samples/ && ${FIND} . \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
-	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}/apidocs
-	@cd ${WRKSRC}/build/ && ${FIND} apidocs \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
-	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${ECHO_MSG} " [ DONE ]"
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+ALL_TARGET+=	javadoc
 .endif
 
-.if !defined(NOPORTDOCS)
-post-install:
-	@${FIND} -s ${WRKSRC}/build/samples -not -type d | \
-		${SED} -ne 's,^${WRKSRC}/build/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC}/build/samples -type d | \
-		${SED} -ne 's,^${WRKSRC}/build/samples,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+do-install:
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/build/jdom.jar ${STAGEDIR}${JAVAJARDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/build/samples/ && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR})
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/build && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} README.txt TODO.txt CHANGES.txt \
+		COMMITTERS.txt LICENSE.txt ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>