diff options
| author | jlam <jlam> | 2001-04-19 19:11:59 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-04-19 19:11:59 +0000 |
| commit | b280e2c1ed1a269c9bfbb8f7dee673036611aa26 (patch) | |
| tree | 9f2eb9be1665a2910c5f838d78bc572984e80897 | |
| parent | e0bfcc8171da7f20fe90e5e67c712e0dd58eabad (diff) | |
| download | pkgsrc-b280e2c1ed1a269c9bfbb8f7dee673036611aa26.tar.gz | |
Handle freetype2 package like the MesaLib package as it is bundled with
XFree86-4.0.x.
| -rw-r--r-- | graphics/freetype2/Makefile | 15 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
2 files changed, 20 insertions, 5 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 5bb979eb2c3..488731591e7 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/24 02:09:28 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2001/04/19 19:11:59 jlam Exp $ # DISTNAME= freetype-2.0.1 @@ -15,12 +15,19 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.freetype.org/ COMMENT= font rendering engine and library API -USE_GMAKE= YES -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +CHECK_FREETYPE2= YES +USE_GMAKE= YES +GNU_CONFIGURE= YES +USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/builds/unix/ltconfig +.include "../../mk/bsd.prefs.mk" + +.if ${HAVE_BUILTIN_FREETYPE2} != "NO" +IGNORE= "FreeType2 has already been installed as part of XFree86-4.x" +.endif + post-patch: ${RM} -f ${LTCONFIG_OVERRIDE} ; \ ${ECHO} "${RM} -f libtool; ${LN} -s ${LIBTOOL} libtool" \ diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 71bdd488e7c..88b8bdeb77e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.722 2001/04/18 21:50:46 dmcmahill Exp $ +# $NetBSD: bsd.pkg.mk,v 1.723 2001/04/19 19:11:59 jlam Exp $ # # This file is in the public domain. # @@ -857,6 +857,14 @@ 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) |