diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-03-19 10:16:33 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-03-19 10:16:33 +0000 |
| commit | 73c3b7191e9ffff2c82dccd6be4ca4720fd58d15 (patch) | |
| tree | 1ea051e4aeb34dd76aa16ccdbe073fb988f86828 /graphics | |
| parent | 55186b3943921bcfda2f797c43ce0194a485e5a7 (diff) | |
| download | pkgsrc-73c3b7191e9ffff2c82dccd6be4ca4720fd58d15.tar.gz | |
Move bzip2 and zlib buildlink3 out of the png PKG_OPTION check, they are
unconditional dependencies.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/freetype2/buildlink3.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 7b3c26db21a..70a52d1322a 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2014/03/14 19:39:52 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2014/03/19 10:16:33 jperkin Exp $ BUILDLINK_TREE+= freetype2 @@ -15,6 +15,9 @@ BUILDLINK_FILES.freetype2+= bin/freetype-config FREETYPE_CONFIG?= ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config CONFIGURE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG:Q} +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" + pkgbase := freetype2 .include "../../mk/pkg-build-options.mk" @@ -23,12 +26,11 @@ CHECK_BUILTIN.freetype2:= yes .include "../../graphics/freetype2/builtin.mk" CHECK_BUILTIN.freetype2:= no -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" .if empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) .include "../../graphics/png/buildlink3.mk" .endif .endif + .endif # FREETYPE2_BUILDLINK3_MK BUILDLINK_TREE+= -freetype2 |