Problems with "freetype2" package under Mac OS X

[Matthias Scheler <tron%NetBSD.org@localhost>]

        Hello,

the following commit has undesired or at least unexpected side effects
under Mac OS X (more detais below):

----- Forwarded message from Joerg Sonnenberger <joerg%netbsd.org@localhost> 
-----

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Mar 19 12:34:25 UTC 2012

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/mk: bsd.pkg.use.mk bsd.prefs.mk
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/mk/platform: AIX.mk BSDOS.mk Darwin.mk DragonFly.mk FreeBSD.mk
            HPUX.mk Haiku.mk IRIX.mk Interix.mk Linux.mk Minix.mk MirBSD.mk
            NetBSD.mk OSF1.mk OpenBSD.mk SunOS.mk UnixWare.mk
        pkgsrc/mk/tools: replace.mk tools.IRIX.mk
        pkgsrc/sysutils/xbattbar: PLIST distinfo
        pkgsrc/sysutils/xbattbar/patches: patch-aa
        pkgsrc/textproc/expat: builtin.mk
        pkgsrc/x11/Xcomposite: builtin.mk
        pkgsrc/x11/Xfixes: builtin.mk
        pkgsrc/x11/Xrender: builtin.mk
        pkgsrc/x11/liboldXrandr: builtin.mk
        pkgsrc/x11/xcursor: builtin.mk
        pkgsrc/x11/xorg-cf-files: Makefile distinfo
        pkgsrc/x11/xorg-cf-files/patches: patch-ah patch-ai patch-aj patch-ak
Added Files:
        pkgsrc/x11/xorg-cf-files/patches: patch-X11.rules patch-X11.tmpl
            patch-gnuLib.rules
Removed Files:
        pkgsrc/mk/buildlink3: imake-check imake-check.mk

Log Message:
Drop imake-check logic from X11 components' builtin.mk.
Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge.
Always install man pages, not cat pages when using imake.
Unify the various imake PLIST variables in preparation for dropping.
Adjust xbattbar for the new expectations.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/fonts/Xft2/builtin.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/fontconfig/builtin.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/MesaLib/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/freetype2/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/glu/builtin.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/mk/bsd.pkg.use.mk
cvs rdiff -u -r1.320 -r1.321 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/mk/buildlink3/imake-check
cvs rdiff -u -r1.9 -r0 pkgsrc/mk/buildlink3/imake-check.mk
cvs rdiff -u -r1.204 -r1.205 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.37 -r1.38 pkgsrc/mk/platform/AIX.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mk/platform/BSDOS.mk
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mk/platform/Darwin.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mk/platform/DragonFly.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/platform/FreeBSD.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mk/platform/HPUX.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/platform/Haiku.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/mk/platform/IRIX.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/mk/platform/Interix.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/mk/platform/Linux.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/platform/Minix.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/platform/MirBSD.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/mk/platform/NetBSD.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mk/platform/OSF1.mk \
    pkgsrc/mk/platform/UnixWare.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mk/platform/OpenBSD.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/platform/SunOS.mk
cvs rdiff -u -r1.245 -r1.246 pkgsrc/mk/tools/replace.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mk/tools/tools.IRIX.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xbattbar/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/xbattbar/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xbattbar/patches/patch-aa
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/expat/builtin.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/Xcomposite/builtin.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/Xfixes/builtin.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/Xrender/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/liboldXrandr/builtin.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xcursor/builtin.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xorg-cf-files/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xorg-cf-files/patches/patch-X11.rules \
    pkgsrc/x11/xorg-cf-files/patches/patch-X11.tmpl \
    pkgsrc/x11/xorg-cf-files/patches/patch-gnuLib.rules
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/xorg-cf-files/patches/patch-ah \
    pkgsrc/x11/xorg-cf-files/patches/patch-ai
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xorg-cf-files/patches/patch-aj
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xorg-cf-files/patches/patch-ak

----- End forwarded message -----

tron@excalibur:/usr/pkgsrc/net/wireshark>bmake VARNAME=USE_BUILTIN.freetype2 
show-var
yes
tron@excalibur:/usr/pkgsrc/net/wireshark>bmake VARNAME=BUILTIN_PKG.freetype2 
show-var
freetype2-2.3.9

Before this change "pkgsrc" would not use the system provided "freetype2".
Looking at the required version numbers ...

BUILDLINK_API_DEPENDS.freetype2+=       freetype2>=2.1.8
BUILDLINK_ABI_DEPENDS.freetype2+=       freetype2>=2.4.7nb2

... it should still not do that. Looking at "freetype2/builtin.mk" ...

.      for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
.        if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
USE_BUILTIN.freetype2!=                                                 \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2:Q}; then \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \
        fi
.        endif
.      endfor

... I wonder if this check is wrong. Should it check both "API_DEPENDS"
and "ABI_DEPENDS"? Or are the version numbers just not sensible?

        Kind regards

-- 
Matthias Scheler                                  http://zhadum.org.uk/