From owner-svn-ports-all@freebsd.org  Thu Feb  4 18:51:43 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AF2CA9BE4B;
 Thu,  4 Feb 2016 18:51:43 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 B6A68F9F;
 Thu,  4 Feb 2016 18:51:42 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u14IpfAT083835;
 Thu, 4 Feb 2016 18:51:41 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u14Ipf9T083833;
 Thu, 4 Feb 2016 18:51:41 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602041851.u14Ipf9T083833@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 4 Feb 2016 18:51:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408078 - head/graphics/jogl
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Feb 2016 18:51:43 -0000

Author: amdmi3
Date: Thu Feb  4 18:51:41 2016
New Revision: 408078
URL: https://svnweb.freebsd.org/changeset/ports/408078

Log:
  - Switch to options helpers
  - Add missing file to plist
  
  Approved by:	portmgr blanket

Modified:
  head/graphics/jogl/Makefile
  head/graphics/jogl/pkg-plist

Modified: head/graphics/jogl/Makefile
==============================================================================
--- head/graphics/jogl/Makefile	Thu Feb  4 18:51:29 2016	(r408077)
+++ head/graphics/jogl/Makefile	Thu Feb  4 18:51:41 2016	(r408078)
@@ -83,17 +83,17 @@ pre-build:
 	${CHMOD} 755 ${BUILD_BINPATH}/gcc
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/jogl/doc/userguide/index.html \
-		${STAGEDIR}${DOCSDIR}/UserGuide.html
-	cd ${BUILD_WRKSRC}/../javadoc_public && \
-		${FIND} . -print | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}
-.endif
 	${INSTALL_DATA} ${WRKSRC}/gluegen/build/obj/libgluegen-rt.so \
 		${WRKSRC}/jogl/build/obj/libjogl.so \
 		${WRKSRC}/jogl/build/obj/libjogl_awt.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/gluegen/build/gluegen-rt.jar \
 		${WRKSRC}/jogl/build/jogl.jar ${STAGEDIR}${JAVAJARDIR}
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/jogl/doc/userguide/index.html \
+		${STAGEDIR}${DOCSDIR}/UserGuide.html
+	cd ${BUILD_WRKSRC}/../javadoc_public && \
+		${FIND} . -print | ${CPIO} -pdm ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.post.mk>

Modified: head/graphics/jogl/pkg-plist
==============================================================================
--- head/graphics/jogl/pkg-plist	Thu Feb  4 18:51:29 2016	(r408077)
+++ head/graphics/jogl/pkg-plist	Thu Feb  4 18:51:41 2016	(r408078)
@@ -52,6 +52,7 @@ lib/libjogl_awt.so
 %%PORTDOCS%%%%DOCSDIR%%/help-doc.html
 %%PORTDOCS%%%%DOCSDIR%%/index-all.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/script.js
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AWTGraphicsConfiguration.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AWTGraphicsDevice.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AbstractGraphicsConfiguration.html