On Thu, Apr 19, 2001 at 10:12:00PM +0300, Johnny C. Lam wrote:
> 
> Module Name:	pkgsrc
> Committed By:	jlam
> Date:		Thu Apr 19 19:12:00 UTC 2001
> 
> Modified Files:
> 	pkgsrc/graphics/freetype2: Makefile
> 	pkgsrc/mk: bsd.pkg.mk
> 
> Log Message:
> Handle freetype2 package like the MesaLib package as it is bundled with
> XFree86-4.0.x.

Hmmm, that is not completely like the MesaLib package use it.

You are missing an important part from pkgsrc/mk/bsd.prefs.mk:

------------------------------cut----------------------------------------
# Check if we got Mesa distributed with XFree86 4.x or if we need to
# depend on the Mesa package.
.if (defined(CHECK_MESA) || defined(USE_MESA))
X11BASE?=		/usr/X11R6
.if exists(${X11BASE}/include/GL/glx.h)
__BUILTIN_MESA!=	egrep -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || true
.else
__BUILTIN_MESA=		0
.endif
.if ${__BUILTIN_MESA} == "0"
HAVE_BUILTIN_MESA=	NO
.else
HAVE_BUILTIN_MESA=	YES
.endif
.undef __BUILTIN_MESA
.endif	# CHECK_MESA
------------------------------cut----------------------------------------

I can't find a check for HAVE_BUILTIN_FREETYPE2 in bsd.prefs.mk.

And no, people are not expected to add this to /etc/mk.conf.
They can and must do it now, but it should be checked in bsd.prefs.mk.

I think you need something like above and check for BuildFreetype2Library in X11.tmpl.

Btw, we also need to change the Mesa checks. XFree 4.0.99.x aka, the upcoming
version 4.1.0, includes now libGLU and include/GL/{glu,glxmd,glxproto}.h.
glu.h has a GLU_VERSION_1_3 in it, so it is newer our pkgsrc one:

/* Version */ 
#define GLU_VERSION_1_1                    1
#define GLU_VERSION_1_2                    1
#define GLU_VERSION_1_3                    1

/* StringName */
#define GLU_VERSION                        100800
#define GLU_EXTENSIONS                     100801

Hmmm, I am not sure now, how we have to handle graphics/glut.

Bernd