diff options
| author | wiz <wiz@pkgsrc.org> | 2002-10-20 11:47:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-10-20 11:47:04 +0000 |
| commit | accb9cb69dd5f280ca4e501eca19c879195c29d8 (patch) | |
| tree | d6eb0a5cf84cc28186753c321245277b7a586e89 /mk | |
| parent | e5feb6e0dd133ee461956376fb9360acd9e7a83c (diff) | |
| download | pkgsrc-accb9cb69dd5f280ca4e501eca19c879195c29d8.tar.gz | |
Remove obsolete USE_FREETYPE2 support; all users have been converted to use
freetype2's buildlink2.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 19 |
2 files changed, 2 insertions, 27 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c0437cf5bcc..edd4439a5e1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1068 2002/10/19 20:33:59 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1069 2002/10/20 11:47:04 wiz Exp $ # # This file is in the public domain. # @@ -747,14 +747,6 @@ DEPENDS+= Mesa>=3.2.1:../../graphics/Mesa . undef __BUILTIN_MESA .endif # USE_MESA -# If USE_FREETYPE2 is set, depend on freetype2. -.if defined(USE_FREETYPE2) -. if ${HAVE_BUILTIN_FREETYPE2} == "NO" -DEPENDS+= freetype2>=2.0.1:../../graphics/freetype2 -. endif -. undef __BUILTIN_FREETYPE2 -.endif # USE_FREETYPE2 - # Check if we got "rman" with XFree86, for packages that need "rman". .if defined(USE_RMAN) . if !exists(${X11BASE}/bin/rman) diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 5217a18c738..ef6f920c5fc 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.82 2002/10/19 20:33:59 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.83 2002/10/20 11:47:05 wiz Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -246,23 +246,6 @@ HAVE_BUILTIN_GLU= YES .undef __BUILTIN_GLU .endif # CHECK_MESA -# Check if we got FreeType2 distributed with XFree86 4.x or if we need to -# depend on the freetype2 package. -.if (defined(CHECK_FREETYPE2) || defined(USE_FREETYPE2)) -X11BASE?= /usr/X11R6 -.if exists(${X11BASE}/include/freetype2/freetype/freetype.h) -__BUILTIN_FREETYPE2!= ${EGREP} -c BuildFreetype2Library ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} -.else -__BUILTIN_FREETYPE2= 0 -.endif -.if ${__BUILTIN_FREETYPE2} == "0" -HAVE_BUILTIN_FREETYPE2= NO -.else -HAVE_BUILTIN_FREETYPE2= YES -.endif -.undef __BUILTIN_FREETYPE2 -.endif # CHECK_FREETYPE2 - # Check if we got Xpm distributed with XFree86 4.x or Solaris 9 or if we need # to depend on the Xpm package. .if (defined(CHECK_XPM) || defined(USE_XPM)) |