[pkgsrc/trunk]: pkgsrc/graphics/freetype2 Move bzip2 and zlib buildlink3 out ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b46c36f537de
branches:  trunk
changeset: 632194:b46c36f537de
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Mar 19 10:16:33 2014 +0000

description:
Move bzip2 and zlib buildlink3 out of the png PKG_OPTION check, they are
unconditional dependencies.

diffstat:

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

diffs (33 lines):

diff -r 2caf294af081 -r b46c36f537de graphics/freetype2/buildlink3.mk
--- a/graphics/freetype2/buildlink3.mk  Wed Mar 19 07:34:20 2014 +0000
+++ b/graphics/freetype2/buildlink3.mk  Wed Mar 19 10:16:33 2014 +0000
@@ -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 @@
 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 @@
 .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