6 files changed, 10 insertions, 5 deletions
diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg
index 26979fb6d..713f74ef2 100755
--- a/make/config/jogl/egl.cfg
+++ b/make/config/jogl/egl.cfg
@@ -47,4 +47,4 @@ CustomJavaCode EGL    return dispatch_eglGetProcAddress0(procname, eglGetProcAdd
 CustomJavaCode EGL  }
 
 
-Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index d9d66323a..36d156727 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -22,6 +22,11 @@ Import com.sun.opengl.impl.*
 # because we don't need them java-side. 
 Ignore GL_VERSION_.+
 
+Ignore glWaitSync
+Ignore glVertexP[2-4].+
+Ignore glVertexAttribP[1-4].+
+Ignore glUniformSubroutines.+
+
 # Ignore GL functions that deal with explicit pointer values in such a
 # way that we cannot implement the functionality in Java
 Ignore glGetBufferPointerv
diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg
index d2525735e..28a4b6cde 100644
--- a/make/config/jogl/gl-gl3bc.cfg
+++ b/make/config/jogl/gl-gl3bc.cfg
@@ -82,7 +82,7 @@ CustomJavaCode GL3bcImpl   glClearDepth((double)depth); }
 CustomJavaCode GL3bcImpl public void glDepthRangef(float zNear, float zFar) {
 CustomJavaCode GL3bcImpl    glDepthRange((double)zNear, (double)zFar); }
 
-Include gl-headers.cfg
+Include gl3-headers.cfg
 Include ../intptr.cfg
 
 IncludeAs CustomJavaCode GL3bcImpl gl-impl-CustomJavaCode-common.java
diff --git a/make/config/jogl/gl-if-CustomJavaCode-gl3.java b/make/config/jogl/gl-if-CustomJavaCode-gl3.java
index 1777c1557..b295e7f8f 100644
--- a/make/config/jogl/gl-if-CustomJavaCode-gl3.java
+++ b/make/config/jogl/gl-if-CustomJavaCode-gl3.java
@@ -1,4 +1,4 @@
-
+//foobar
 /** Part of <code>GL_ARB_uniform_buffer_object</code> */
 public static final int GL_INVALID_INDEX = 0xFFFFFFFF ;
 
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 712f9a305..8b77178f4 100755
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -40,7 +40,7 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java
 # and to the nurbs.* package for the NURBS functionality
 Import com.sun.opengl.impl.glu.nurbs.*
 Import java.security.*
-Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper
+Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper
 Import com.sun.opengl.impl.glu.gl2.nurbs.*
 Import com.sun.opengl.impl.glu.mipmap.Mipmap
 Import com.sun.opengl.impl.glu.gl2.*
diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java
index 3cb1d3619..56057377a 100644
--- a/make/config/jogl/glx-CustomJavaCode.java
+++ b/make/config/jogl/glx-CustomJavaCode.java
@@ -13,7 +13,7 @@
 
 
   /** Interface to C language function: <br> - Alias for: <br> <code> GLXFBConfig *  glXChooseFBConfigSGIX, glXChooseFBConfig(Display *  dpy, int screen, const int *  attribList, int *  nitems); </code>    */
-  public static com.sun.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
+  public static com.jogamp.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset)
   {
     if(attribList != null && attribList.length <= attribList_offset)
       throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")");