CVS commit: pkgsrc

[Quentin Garnier <cube%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cube
Date:           Sun Oct  5 21:36:36 UTC 2008

Modified Files:
        pkgsrc/fonts/Xft2: builtin.mk
        pkgsrc/fonts/fontconfig: builtin.mk
        pkgsrc/graphics/MesaLib: builtin.mk
        pkgsrc/graphics/freetype2: builtin.mk
        pkgsrc/graphics/glu: builtin.mk
        pkgsrc/graphics/xpm: builtin.mk
        pkgsrc/misc/openoffice2: Makefile.NetBSD
        pkgsrc/mk: bsd.prefs.mk x11.builtin.mk
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/pkgtools/x11-links: xorg.mk
        pkgsrc/pkgtools/x11-links/files: xfree.MesaLib xfree.Xft2 xfree.xpm
            xorg xorg.Xcomposite xorg.Xfixes xorg.compositeproto xorg.expat
            xorg.fixesproto xorg.fontconfig xorg.freetype2 xorg.libXrandr
            xorg.libXrender xorg.pixman xorg.xcursor xorg.xextproto
        pkgsrc/textproc/expat: builtin.mk
        pkgsrc/x11/Xcomposite: builtin.mk
        pkgsrc/x11/Xfixes: builtin.mk
        pkgsrc/x11/Xrender: builtin.mk
        pkgsrc/x11/compositeproto: builtin.mk
        pkgsrc/x11/fixesproto: builtin.mk
        pkgsrc/x11/inputproto: builtin.mk
        pkgsrc/x11/kbproto: builtin.mk
        pkgsrc/x11/libICE: builtin.mk
        pkgsrc/x11/libSM: builtin.mk
        pkgsrc/x11/libX11: builtin.mk
        pkgsrc/x11/libXScrnSaver: buildlink3.mk
        pkgsrc/x11/libXau: builtin.mk
        pkgsrc/x11/libXdamage: buildlink3.mk
        pkgsrc/x11/libXdmcp: builtin.mk
        pkgsrc/x11/libXext: builtin.mk
        pkgsrc/x11/libXinerama: builtin.mk
        pkgsrc/x11/libXmu: builtin.mk
        pkgsrc/x11/libXrandr: builtin.mk
        pkgsrc/x11/libXrender: builtin.mk
        pkgsrc/x11/libXres: buildlink3.mk
        pkgsrc/x11/libXt: builtin.mk
        pkgsrc/x11/liboldXrandr: builtin.mk
        pkgsrc/x11/randrproto: builtin.mk
        pkgsrc/x11/renderproto: builtin.mk
        pkgsrc/x11/xcursor: builtin.mk
        pkgsrc/x11/xextproto: builtin.mk
        pkgsrc/x11/xineramaproto: builtin.mk
        pkgsrc/x11/xproto: builtin.mk
Added Files:
        pkgsrc/fonts/libfontenc: builtin.mk
        pkgsrc/mk/buildlink3: pkgconfig-builtin.mk
        pkgsrc/pkgtools/x11-links/files: xorg.bigreqsproto xorg.damageproto
            xorg.evieext xorg.fontcacheproto xorg.fontsproto xorg.glproto
            xorg.libFS xorg.libXScrnSaver xorg.libXTrap xorg.libXdamage
            xorg.libXevie xorg.libXfont xorg.libXprintUtil xorg.libXres
            xorg.libdrm xorg.libfontenc xorg.liblbxutil xorg.printproto
            xorg.recordproto xorg.resourceproto xorg.scrnsaverproto
            xorg.trapproto xorg.videoproto xorg.xcmiscproto
            xorg.xf86bigfontproto xorg.xf86dgaproto xorg.xf86driproto
            xorg.xf86miscproto xorg.xf86vidmodeproto
            xorg.xproxymanagementprotocol xorg.xtrans
        pkgsrc/x11/bigreqsproto: builtin.mk
        pkgsrc/x11/damageproto: builtin.mk
        pkgsrc/x11/evieext: builtin.mk
        pkgsrc/x11/fontcacheproto: builtin.mk
        pkgsrc/x11/fontsproto: builtin.mk
        pkgsrc/x11/glproto: builtin.mk
        pkgsrc/x11/libFS: builtin.mk
        pkgsrc/x11/libXScrnSaver: builtin.mk
        pkgsrc/x11/libXTrap: builtin.mk
        pkgsrc/x11/libXdamage: builtin.mk
        pkgsrc/x11/libXevie: builtin.mk
        pkgsrc/x11/libXfont: builtin.mk
        pkgsrc/x11/libXprintUtil: builtin.mk
        pkgsrc/x11/libXres: builtin.mk
        pkgsrc/x11/libdrm: builtin.mk
        pkgsrc/x11/liblbxutil: builtin.mk
        pkgsrc/x11/pixman: builtin.mk
        pkgsrc/x11/printproto: builtin.mk
        pkgsrc/x11/recordproto: builtin.mk
        pkgsrc/x11/resourceproto: builtin.mk
        pkgsrc/x11/scrnsaverproto: builtin.mk
        pkgsrc/x11/trapproto: builtin.mk
        pkgsrc/x11/videoproto: builtin.mk
        pkgsrc/x11/xcmiscproto: builtin.mk
        pkgsrc/x11/xf86bigfontproto: builtin.mk
        pkgsrc/x11/xf86dgaproto: builtin.mk
        pkgsrc/x11/xf86driproto: builtin.mk
        pkgsrc/x11/xf86miscproto: builtin.mk
        pkgsrc/x11/xf86vidmodeproto: builtin.mk
        pkgsrc/x11/xproxymanagementprotocol: builtin.mk
        pkgsrc/x11/xtrans: builtin.mk
Removed Files:
        pkgsrc/pkgtools/x11-links/files: xorg.xextensions

Log Message:
Merge cube-native-xorg, so that pkgsrc-current can be used with the native
X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.


To generate a diff of this commit:
cvs rdiff -r1.16 -r1.17 pkgsrc/fonts/Xft2/builtin.mk
cvs rdiff -r1.9 -r1.10 pkgsrc/fonts/fontconfig/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/fonts/libfontenc/builtin.mk
cvs rdiff -r1.14 -r1.15 pkgsrc/graphics/MesaLib/builtin.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/graphics/freetype2/builtin.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/graphics/glu/builtin.mk
cvs rdiff -r1.15 -r1.16 pkgsrc/graphics/xpm/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/misc/openoffice2/Makefile.NetBSD
cvs rdiff -r1.287 -r1.288 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/x11.builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/mk/buildlink3/pkgconfig-builtin.mk
cvs rdiff -r1.176 -r1.177 pkgsrc/mk/defaults/mk.conf
cvs rdiff -r1.10 -r1.11 pkgsrc/pkgtools/x11-links/xorg.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/pkgtools/x11-links/files/xfree.MesaLib
cvs rdiff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xfree.Xft2 \
    pkgsrc/pkgtools/x11-links/files/xorg.compositeproto \
    pkgsrc/pkgtools/x11-links/files/xorg.expat \
    pkgsrc/pkgtools/x11-links/files/xorg.fixesproto \
    pkgsrc/pkgtools/x11-links/files/xorg.freetype2 \
    pkgsrc/pkgtools/x11-links/files/xorg.libXrender \
    pkgsrc/pkgtools/x11-links/files/xorg.xcursor \
    pkgsrc/pkgtools/x11-links/files/xorg.xextproto
cvs rdiff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xfree.xpm \
    pkgsrc/pkgtools/x11-links/files/xorg.Xcomposite \
    pkgsrc/pkgtools/x11-links/files/xorg.Xfixes \
    pkgsrc/pkgtools/x11-links/files/xorg.fontconfig \
    pkgsrc/pkgtools/x11-links/files/xorg.pixman
cvs rdiff -r1.8 -r1.9 pkgsrc/pkgtools/x11-links/files/xorg
cvs rdiff -r0 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.bigreqsproto \
    pkgsrc/pkgtools/x11-links/files/xorg.damageproto \
    pkgsrc/pkgtools/x11-links/files/xorg.evieext \
    pkgsrc/pkgtools/x11-links/files/xorg.fontcacheproto \
    pkgsrc/pkgtools/x11-links/files/xorg.fontsproto \
    pkgsrc/pkgtools/x11-links/files/xorg.glproto \
    pkgsrc/pkgtools/x11-links/files/xorg.libFS \
    pkgsrc/pkgtools/x11-links/files/xorg.libXScrnSaver \
    pkgsrc/pkgtools/x11-links/files/xorg.libXTrap \
    pkgsrc/pkgtools/x11-links/files/xorg.libXdamage \
    pkgsrc/pkgtools/x11-links/files/xorg.libXevie \
    pkgsrc/pkgtools/x11-links/files/xorg.libXfont \
    pkgsrc/pkgtools/x11-links/files/xorg.libXprintUtil \
    pkgsrc/pkgtools/x11-links/files/xorg.libXres \
    pkgsrc/pkgtools/x11-links/files/xorg.libdrm \
    pkgsrc/pkgtools/x11-links/files/xorg.libfontenc \
    pkgsrc/pkgtools/x11-links/files/xorg.liblbxutil \
    pkgsrc/pkgtools/x11-links/files/xorg.printproto \
    pkgsrc/pkgtools/x11-links/files/xorg.recordproto \
    pkgsrc/pkgtools/x11-links/files/xorg.resourceproto \
    pkgsrc/pkgtools/x11-links/files/xorg.scrnsaverproto \
    pkgsrc/pkgtools/x11-links/files/xorg.trapproto \
    pkgsrc/pkgtools/x11-links/files/xorg.videoproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xcmiscproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xf86bigfontproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xf86dgaproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xf86driproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xf86miscproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xf86vidmodeproto \
    pkgsrc/pkgtools/x11-links/files/xorg.xproxymanagementprotocol \
    pkgsrc/pkgtools/x11-links/files/xorg.xtrans
cvs rdiff -r1.3 -r1.4 pkgsrc/pkgtools/x11-links/files/xorg.libXrandr
cvs rdiff -r1.1 -r0 pkgsrc/pkgtools/x11-links/files/xorg.xextensions
cvs rdiff -r1.12 -r1.13 pkgsrc/textproc/expat/builtin.mk
cvs rdiff -r1.12 -r1.13 pkgsrc/x11/Xcomposite/builtin.mk
cvs rdiff -r1.10 -r1.11 pkgsrc/x11/Xfixes/builtin.mk
cvs rdiff -r1.17 -r1.18 pkgsrc/x11/Xrender/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/bigreqsproto/builtin.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/x11/compositeproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/damageproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/evieext/builtin.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/x11/fixesproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/fontcacheproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/fontsproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/glproto/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/inputproto/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/kbproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libFS/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libICE/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libSM/builtin.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/x11/libX11/builtin.mk
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/x11/libXScrnSaver/buildlink3.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXScrnSaver/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXTrap/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXau/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/libXdamage/buildlink3.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXdamage/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXdmcp/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXevie/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXext/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXfont/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXinerama/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXmu/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXprintUtil/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXrandr/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXrender/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/libXres/buildlink3.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libXres/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/libXt/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/libdrm/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/liblbxutil/builtin.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/x11/liboldXrandr/builtin.mk
cvs rdiff -r0 -r1.4 pkgsrc/x11/pixman/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/printproto/builtin.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/x11/randrproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/recordproto/builtin.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/x11/renderproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/resourceproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/scrnsaverproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/trapproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/videoproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xcmiscproto/builtin.mk
cvs rdiff -r1.12 -r1.13 pkgsrc/x11/xcursor/builtin.mk
cvs rdiff -r1.5 -r1.6 pkgsrc/x11/xextproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xf86bigfontproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xf86dgaproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xf86driproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xf86miscproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xf86vidmodeproto/builtin.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/x11/xineramaproto/builtin.mk
cvs rdiff -r1.3 -r1.4 pkgsrc/x11/xproto/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xproxymanagementprotocol/builtin.mk
cvs rdiff -r0 -r1.2 pkgsrc/x11/xtrans/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.