- Add missing files to plist and sort it

Approved by:	portmgr blanket

2 files changed, 35 insertions, 29 deletions

diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index e4eb52c55239..c9fae26869e8 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -3,9 +3,9 @@
 
 PORTNAME=	jogl
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics devel java
-MASTER_SITES=http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/
+MASTER_SITES=	http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/
 EXTRACT_SUFX=	-src.zip
 
 MAINTAINER=	peterj@FreeBSD.org
@@ -54,8 +54,10 @@ ALL_TARGET+=	javadoc
 
 .if ${JAVA_PORT_VERSION} == "1.6.0"
 PLIST_SUB+=	JDK6=""
+PLIST_SUB+=	JDK7="@comment "
 .else
 PLIST_SUB+=	JDK6="@comment "
+PLIST_SUB+=	JDK7=""
 .endif
 
 post-patch:
diff --git a/graphics/jogl/pkg-plist b/graphics/jogl/pkg-plist
index 8baa96151e30..3de4a792af29 100644
--- a/graphics/jogl/pkg-plist
+++ b/graphics/jogl/pkg-plist
@@ -4,12 +4,14 @@ lib/libjogl_awt.so
 %%JAVAJARDIR%%/gluegen-rt.jar
 %%JAVAJARDIR%%/jogl.jar
 %%PORTDOCS%%%%DOCSDIR%%/UserGuide.html
+%%PORTDOCS%%%%DOCSDIR%%/allclasses-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/allclasses-noframe.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/Animator.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/BufferUtil.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/FileUtil.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/FPSAnimator.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/Gamma.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/FileUtil.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/GLUT.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/Gamma.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/ImageUtil.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/JOGLAppletLauncher.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/Screenshot.html
@@ -17,38 +19,43 @@ lib/libjogl_awt.so
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/TGAWriter.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/TileRenderer.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/Overlay.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/TextRenderer.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/TextRenderer.DefaultRenderDelegate.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/TextRenderer.RenderDelegate.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/TextRenderer.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/TextureRenderer.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/package-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/package-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/j2d/package-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/Texture.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/TextureCoords.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/TextureData.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/TextureData.Flusher.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/TextureData.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/TextureIO.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/DDSImage.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/DDSImage.ImageInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/DDSImage.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/SGIImage.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/TGAImage.Header.html
+%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/TGAImage.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/TextureProvider.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/TextureWriter.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/TGAImage.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/TGAImage.Header.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/package-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/package-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/spi/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/texture/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/package-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/package-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/com/sun/opengl/util/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AbstractGraphicsConfiguration.html
-%%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AbstractGraphicsDevice.html
+%%PORTDOCS%%%%DOCSDIR%%/constant-values.html
+%%PORTDOCS%%%%DOCSDIR%%/deprecated-list.html
+%%PORTDOCS%%%%DOCSDIR%%/help-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AWTGraphicsConfiguration.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AWTGraphicsDevice.html
+%%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AbstractGraphicsConfiguration.html
+%%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/AbstractGraphicsDevice.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/ComponentEvents.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/DebugGL.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/DefaultGLCapabilitiesChooser.html
@@ -60,9 +67,9 @@ lib/libjogl_awt.so
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLContext.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLDrawable.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLDrawableFactory.html
-%%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLJPanel.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLEventListener.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLException.html
+%%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLJPanel.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/GLPbuffer.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/Threading.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/TraceGL.html
@@ -78,17 +85,14 @@ lib/libjogl_awt.so
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/package-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/package-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/javax/media/opengl/package-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/package-list
 %%PORTDOCS%%%%DOCSDIR%%/overview-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/constant-values.html
-%%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
-%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
-%%PORTDOCS%%%%DOCSDIR%%/overview-tree.html
-%%PORTDOCS%%%%DOCSDIR%%/index-all.html
-%%PORTDOCS%%%%DOCSDIR%%/deprecated-list.html
-%%PORTDOCS%%%%DOCSDIR%%/allclasses-frame.html
-%%PORTDOCS%%%%DOCSDIR%%/allclasses-noframe.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/overview-summary.html
-%%PORTDOCS%%%%DOCSDIR%%/help-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/overview-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/package-list
+%%JDK7%%%%PORTDOCS%%%%DOCSDIR%%/resources/background.gif
+%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
+%%JDK7%%%%PORTDOCS%%%%DOCSDIR%%/resources/tab.gif
+%%JDK7%%%%PORTDOCS%%%%DOCSDIR%%/resources/titlebar.gif
+%%JDK7%%%%PORTDOCS%%%%DOCSDIR%%/resources/titlebar_end.gif
+%%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet.css