[pkgsrc/trunk]: pkgsrc/graphics/freetype2 Make png dependency as option, and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/626754f906fc
branches:  trunk
changeset: 631867:626754f906fc
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Mar 14 14:54:02 2014 +0000

description:
Make png dependency as option, and move option to options.mk
Revert bump of BUILDLINK_ABI_DEPENDS.freetype2

diffstat:

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

diffs (82 lines):

diff -r 30757d7e9a6f -r 626754f906fc graphics/freetype2/Makefile
--- a/graphics/freetype2/Makefile       Fri Mar 14 14:51:49 2014 +0000
+++ b/graphics/freetype2/Makefile       Fri Mar 14 14:54:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2014/03/13 23:26:35 spz Exp $
+# $NetBSD: Makefile,v 1.93 2014/03/14 14:54:02 ryoon Exp $
 
 DISTNAME=      freetype-2.5.3
 PKGNAME=       ${DISTNAME:S/-/2-/}
@@ -32,15 +32,7 @@
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.freetype2
-PKG_SUPPORTED_OPTIONS= subpixel
-
-.include "../../mk/bsd.options.mk"
-
-# subpixel (lcd) rendering, patent issues
-.if !empty(PKG_OPTIONS:Msubpixel)
-CFLAGS+=       -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
-.endif
+.include "options.mk"
 
 # source code breaks strict aliasing in gcc>=2.95
 .if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*)
diff -r 30757d7e9a6f -r 626754f906fc graphics/freetype2/buildlink3.mk
--- a/graphics/freetype2/buildlink3.mk  Fri Mar 14 14:51:49 2014 +0000
+++ b/graphics/freetype2/buildlink3.mk  Fri Mar 14 14:54:02 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2014/03/14 13:43:17 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2014/03/14 14:54:02 ryoon Exp $
 
 BUILDLINK_TREE+=       freetype2
 
@@ -6,7 +6,7 @@
 FREETYPE2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.4.5
-BUILDLINK_ABI_DEPENDS.freetype2+=      freetype2>=2.4.12
+BUILDLINK_ABI_DEPENDS.freetype2+=      freetype2>=2.4.11
 BUILDLINK_PKGSRCDIR.freetype2?=        ../../graphics/freetype2
 BUILDLINK_INCDIRS.freetype2?=  include/freetype2
 
@@ -15,6 +15,7 @@
 FREETYPE_CONFIG?=      ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
 CONFIGURE_ENV+=                FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}
 
+.if !empty(PKG_BUILD_OPTIONS.freetype2:Mpng)
 CHECK_BUILTIN.freetype2:=      yes
 .include "../../graphics/freetype2/builtin.mk"
 CHECK_BUILTIN.freetype2:=      no
@@ -24,6 +25,7 @@
 .if empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
 .include "../../graphics/png/buildlink3.mk"
 .endif
+.endif
 .endif # FREETYPE2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -freetype2
diff -r 30757d7e9a6f -r 626754f906fc graphics/freetype2/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/freetype2/options.mk     Fri Mar 14 14:54:02 2014 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2014/03/14 14:54:02 ryoon Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.freetype2
+PKG_SUPPORTED_OPTIONS= png subpixel
+
+.include "../../mk/bsd.options.mk"
+
+# subpixel (lcd) rendering, patent issues
+.if !empty(PKG_OPTIONS:Msubpixel)
+CFLAGS+=       -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
+.endif
+
+.if !empty(PKG_OPTIONS:Mpng)
+CONFIGURE_ARGS+= --enable-png=yes
+.include "../../graphics/png/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --enable-png=no
+.endif