[pkgsrc/trunk]: pkgsrc/graphics/freetype2 make the optional-png logics work

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd5a31e48fbb
branches:  trunk
changeset: 632039:cd5a31e48fbb
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Mar 14 19:39:52 2014 +0000

description:
make the optional-png logics work

diffstat:

 graphics/freetype2/Makefile      |  3 +--
 graphics/freetype2/buildlink3.mk |  5 ++++-
 graphics/freetype2/options.mk    |  6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r f4f959b4e3cb -r cd5a31e48fbb graphics/freetype2/Makefile
--- a/graphics/freetype2/Makefile       Fri Mar 14 19:33:59 2014 +0000
+++ b/graphics/freetype2/Makefile       Fri Mar 14 19:39:52 2014 +0000
@@ -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 @@
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f4f959b4e3cb -r cd5a31e48fbb graphics/freetype2/buildlink3.mk
--- a/graphics/freetype2/buildlink3.mk  Fri Mar 14 19:33:59 2014 +0000
+++ b/graphics/freetype2/buildlink3.mk  Fri Mar 14 19:39:52 2014 +0000
@@ -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 @@
 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 -r f4f959b4e3cb -r cd5a31e48fbb graphics/freetype2/options.mk
--- a/graphics/freetype2/options.mk     Fri Mar 14 19:33:59 2014 +0000
+++ b/graphics/freetype2/options.mk     Fri Mar 14 19:39:52 2014 +0000
@@ -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 @@
 .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