- Switch to options helpers

- Add missing file to plist

Approved by:	portmgr blanket

2 files changed, 8 insertions, 7 deletions

diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index 590c79175634..40239aec6364 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -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>
diff --git a/graphics/jogl/pkg-plist b/graphics/jogl/pkg-plist
index 3de4a792af29..d5671a9493c6 100644
--- a/graphics/jogl/pkg-plist
+++ b/graphics/jogl/pkg-plist
@@ -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