From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  1 07:56:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 D654B7D5;
 Tue,  1 Apr 2014 07:56:06 +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 A9455CF9;
 Tue,  1 Apr 2014 07:56:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s317u6Lq053736;
 Tue, 1 Apr 2014 07:56:06 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s317u6o6053735;
 Tue, 1 Apr 2014 07:56:06 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404010756.s317u6o6053735@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Tue, 1 Apr 2014 07:56:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349822 - head/devel/jgoodies-common
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.17
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: Tue, 01 Apr 2014 07:56:06 -0000

Author: pawel
Date: Tue Apr  1 07:56:06 2014
New Revision: 349822
URL: http://svnweb.freebsd.org/changeset/ports/349822
QAT: https://qat.redports.org/buildarchive/r349822/

Log:
  - Add staging support
  - More precise LICENSE
  - Define DOCS option

Modified:
  head/devel/jgoodies-common/Makefile

Modified: head/devel/jgoodies-common/Makefile
==============================================================================
--- head/devel/jgoodies-common/Makefile	Tue Apr  1 06:14:22 2014	(r349821)
+++ head/devel/jgoodies-common/Makefile	Tue Apr  1 07:56:06 2014	(r349822)
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstract and helper classes used by all other JGoodies libs
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
@@ -28,13 +28,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+=	javadoc
-PORTDOCS=	*
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} 's|haltonfailure="no"|haltonfailure="yes"|' \
 		${WRKSRC}/build.xml
@@ -49,12 +52,14 @@ post-patch:
 .endif
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -R ${WRKSRC}/README.html ${WRKSRC}/RELEASE-NOTES.txt ${WRKSRC}/docs ${DOCSDIR}/
-	@${CP} -R ${WRKSRC}/build/docs/api ${DOCSDIR}/docs
-	# Documentation, including javadoc-generated, was installed in ${DOCSDIR}.
+	${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README.html RELEASE-NOTES.txt \
+		${STAGEDIR}${DOCSDIR})	
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/build/docs && ${COPYTREE_SHARE} api \
+		${STAGEDIR}${DOCSDIR}/docs)
 .endif
 
 .include <bsd.port.mk>