diff options
| author | drochner <drochner> | 2014-03-14 19:39:52 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2014-03-14 19:39:52 +0000 |
| commit | f2d06daa12c7aa6f23285e00a8ec3097e9159da7 (patch) | |
| tree | b7fd8ad4ecd420d768f74fdcbb2bf999a26b14ff /graphics/freetype2 | |
| parent | 54e1e307db5ce3c78c11e77a0d8b730c1a6710fc (diff) | |
| download | pkgsrc-f2d06daa12c7aa6f23285e00a8ec3097e9159da7.tar.gz | |
make the optional-png logics work
Diffstat (limited to 'graphics/freetype2')
| -rw-r--r-- | graphics/freetype2/Makefile | 3 | ||||
| -rw-r--r-- | graphics/freetype2/buildlink3.mk | 5 | ||||
| -rw-r--r-- | graphics/freetype2/options.mk | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 71d13a34c40..efc8bcfeca6 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2014/03/14 14:54:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.94 2014/03/14 19:39:52 drochner Exp $ DISTNAME= freetype-2.5.3 PKGNAME= ${DISTNAME:S/-/2-/} @@ -56,5 +56,4 @@ post-configure: .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index 5ed2fe942b3..7b3c26db21a 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.42 2014/03/14 14:54:02 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.43 2014/03/14 19:39:52 drochner 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} +pkgbase := freetype2 +.include "../../mk/pkg-build-options.mk" + .if !empty(PKG_BUILD_OPTIONS.freetype2:Mpng) CHECK_BUILTIN.freetype2:= yes .include "../../graphics/freetype2/builtin.mk" diff --git a/graphics/freetype2/options.mk b/graphics/freetype2/options.mk index 2749911e5fa..e9336928fa5 100644 --- a/graphics/freetype2/options.mk +++ b/graphics/freetype2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/03/14 14:54:02 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2014/03/14 19:39:52 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2 PKG_SUPPORTED_OPTIONS= png subpixel @@ -11,8 +11,8 @@ CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING .endif .if !empty(PKG_OPTIONS:Mpng) -CONFIGURE_ARGS+= --enable-png=yes +CONFIGURE_ARGS+= --with-png=yes .include "../../graphics/png/buildlink3.mk" .else -CONFIGURE_ARGS+= --enable-png=no +CONFIGURE_ARGS+= --with-png=no .endif |