CVS commit: pkgsrc/fonts/harfbuzz

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jun  3 12:27:48 UTC 2019

Modified Files:
        pkgsrc/fonts/harfbuzz: Makefile buildlink3.mk

Log Message:
Include mk file earlier to enable rust conditional


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/fonts/harfbuzz/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/harfbuzz/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/harfbuzz/Makefile
diff -u pkgsrc/fonts/harfbuzz/Makefile:1.112 pkgsrc/fonts/harfbuzz/Makefile:1.113
--- pkgsrc/fonts/harfbuzz/Makefile:1.112        Sun Jun  2 03:11:30 2019
+++ pkgsrc/fonts/harfbuzz/Makefile      Mon Jun  3 12:27:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2019/06/02 03:11:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.113 2019/06/03 12:27:48 ryoon Exp $
 
 DISTNAME=      harfbuzz-2.4.0
 PKGREVISION=   3
@@ -15,6 +15,7 @@ LICENSE=      mit
 
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=           graphite2
+.include "../../lang/rust/platform.mk"
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
@@ -61,8 +62,6 @@ PLIST.coretext=               yes
 .  endif
 .endif
 
-.include "../../lang/rust/platform.mk"
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #cairo is only needed for the hb-view command line utility

Index: pkgsrc/fonts/harfbuzz/buildlink3.mk
diff -u pkgsrc/fonts/harfbuzz/buildlink3.mk:1.9 pkgsrc/fonts/harfbuzz/buildlink3.mk:1.10
--- pkgsrc/fonts/harfbuzz/buildlink3.mk:1.9     Mon Nov 12 03:49:09 2018
+++ pkgsrc/fonts/harfbuzz/buildlink3.mk Mon Jun  3 12:27:48 2019
@@ -1,16 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/11/12 03:49:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/06/03 12:27:48 ryoon Exp $
 
 BUILDLINK_TREE+=       harfbuzz
 
 .if !defined(HARFBUZZ_BUILDLINK3_MK)
 HARFBUZZ_BUILDLINK3_MK:=
 
+.include "../../lang/rust/platform.mk"
+
 BUILDLINK_API_DEPENDS.harfbuzz+=       harfbuzz>=2.1.1
 BUILDLINK_ABI_DEPENDS.harfbuzz+=       harfbuzz>=2.1.1
 BUILDLINK_PKGSRCDIR.harfbuzz?=         ../../fonts/harfbuzz
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.include "../../graphics/graphite2/buildlink3.mk"
+.endif
 .endif # HARFBUZZ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -harfbuzz