hopengl fails to compile in cvs head

Hello,

Under both Linux (Debian) and FreeBSD, I get the following error building ghc 
from cvs head:

------------------------------------------------------------------------
==fptools== gmake boot -wr;
 in /usr/ports/lang/ghc-cvs/work/fptools/libraries/OpenGL
------------------------------------------------------------------------
../../ghc/utils/ghc-pkg/ghc-pkg-inplace --update-package <package.conf.inplace
Reading package info from stdin... 
Fail: Couldn't parse package configuration.
gmake[2]: *** [../../ghc/driver/stamp-pkg-conf-OpenGL] Error 1
gmake[1]: *** [boot] Error 1
gmake[1]: Leaving directory `/usr/ports/lang/ghc-cvs/work/fptools/libraries'
gmake: *** [build] Error 1

Here is the tail of  package.conf.inplace. If I remove the commas at the 
beginning of the lists in extra_cc_opts and extra_ld_opts, then things proceed 
normally.  (I have to also do the same thing to package.conf.installed)

Package {
        name            = "OpenGL",
        auto            = True,

        import_dirs     = [ "$libdir/libraries/OpenGL" ],

        source_dirs     = [],

        library_dirs    = [ "$libdir/libraries/OpenGL"
                          , "$libdir/libraries/OpenGL/cbits" ],

        hs_libraries    = [ "HSOpenGL" ],
        extra_libraries = [ "HSOpenGL_cbits"],

        include_dirs    = [ "$libdir/libraries/OpenGL/include" ],

        c_includes      = [ "HsOpenGL.h" ],
        package_deps    = [ "base", "mtl" ],
        extra_ghc_opts  = [],
        extra_cc_opts   = [  ,"-I/usr/X11R6/include" ],

        extra_ld_opts   = [  ,"-lGLU" ,"-lGL" ,"-L/usr/X11R6/lib" ,"-lX11" 
,"-lm" ]
}

I noticed in package.conf.in those two problematic lines contain empty quotes. 
However,  package.conf.in has contained those empty quotes since its inception 
-- so I suspect that it must be one of the tools that processes the files that 
has changed recently. I did not have the problem at the beginning of January 
when I compiled from CVS head. (I did see the problem a few days ago when I 
reported an unrelated error).

Here are the relevant lines from package.conf.in:

       extra_cc_opts   = [ "" GLU_CFLAGS ],
#ifdef USE_QUARTZ_OPENGL
        extra_frameworks = [ "OpenGL" ],
#endif
        extra_ld_opts   = [ "" GLU_LIBS ]
}

I happen to have my 6.0.1 build directory around still,  here is the tail end 
of  package.conf.installed:

        extra_cc_opts   = [ ""  ],
        extra_ld_opts   = [ ""  ]
}

Also, I noticed that the package.conf.inplace and package.conf.installed files 
have a little over 1100 blank lines at the beginning.  This does not cause any 
problems -- I just thought it was odd. (The extra lines are present in the 
6.0.1 version, so this is nothing new).

On linux I was using 5.04 as the bootstrap compiler, and on FreeBSD I was using 
6.0.1

If you have any questions, let me know. 

Jeremy Shaw.