pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc *: use LIBRSVG_TYPE instead of PLATFORM_SUPPORTS_RUST



details:   https://anonhg.NetBSD.org/pkgsrc/rev/643907ca4f44
branches:  trunk
changeset: 334899:643907ca4f44
user:      leot <leot%pkgsrc.org@localhost>
date:      Sat Jun 08 19:53:26 2019 +0000

description:
*: use LIBRSVG_TYPE instead of PLATFORM_SUPPORTS_RUST

diffstat:

 devel/pango/Makefile         |   6 +++---
 fonts/harfbuzz/Makefile      |   8 ++++----
 fonts/harfbuzz/buildlink3.mk |   6 +++---
 misc/libreoffice/Makefile    |  10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (126 lines):

diff -r 3f557a9a40aa -r 643907ca4f44 devel/pango/Makefile
--- a/devel/pango/Makefile      Sat Jun 08 19:51:38 2019 +0000
+++ b/devel/pango/Makefile      Sat Jun 08 19:53:26 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2019/06/02 03:11:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.219 2019/06/08 19:53:26 leot Exp $
 
 DISTNAME=      pango-1.42.4
 PKGREVISION=   4
@@ -33,7 +33,7 @@
 CHECK_PORTABILITY_SKIP+= docs/check.docs
 
 .include "options.mk"
-.include "../../lang/rust/platform.mk"
+.include "../../graphics/librsvg/available.mk"
 
 BUILDLINK_API_DEPENDS.fribidi+=        fribidi>=0.19.7
 .include "../../converters/fribidi/buildlink3.mk"
@@ -46,7 +46,7 @@
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=0.9.9
 .include "../../fonts/harfbuzz/buildlink3.mk"
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.if ${LIBRSVG_TYPE} == "rust"
 .include "../../graphics/graphite2/buildlink3.mk"
 .endif
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.12.10
diff -r 3f557a9a40aa -r 643907ca4f44 fonts/harfbuzz/Makefile
--- a/fonts/harfbuzz/Makefile   Sat Jun 08 19:51:38 2019 +0000
+++ b/fonts/harfbuzz/Makefile   Sat Jun 08 19:53:26 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2019/06/03 12:27:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.114 2019/06/08 19:53:26 leot Exp $
 
 DISTNAME=      harfbuzz-2.4.0
 PKGREVISION=   3
@@ -15,14 +15,14 @@
 
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=           graphite2
-.include "../../lang/rust/platform.mk"
+.include "../../graphics/librsvg/available.mk"
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-cairo=no
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.if ${LIBRSVG_TYPE} == "rust"
 CONFIGURE_ARGS+=       --with-graphite2=yes
 PLIST.graphite2=       yes
 .else
@@ -68,7 +68,7 @@
 #BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0
 #.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.if ${LIBRSVG_TYPE} == "rust"
 # graphite2 support breaks graphics/librsvg
 .include "../../graphics/graphite2/buildlink3.mk"
 .endif
diff -r 3f557a9a40aa -r 643907ca4f44 fonts/harfbuzz/buildlink3.mk
--- a/fonts/harfbuzz/buildlink3.mk      Sat Jun 08 19:51:38 2019 +0000
+++ b/fonts/harfbuzz/buildlink3.mk      Sat Jun 08 19:53:26 2019 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.10 2019/06/03 12:27:48 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2019/06/08 19:53:26 leot Exp $
 
 BUILDLINK_TREE+=       harfbuzz
 
 .if !defined(HARFBUZZ_BUILDLINK3_MK)
 HARFBUZZ_BUILDLINK3_MK:=
 
-.include "../../lang/rust/platform.mk"
+.include "../../graphics/librsvg/available.mk"
 
 BUILDLINK_API_DEPENDS.harfbuzz+=       harfbuzz>=2.1.1
 BUILDLINK_ABI_DEPENDS.harfbuzz+=       harfbuzz>=2.1.1
@@ -13,7 +13,7 @@
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.if ${LIBRSVG_TYPE} == "rust"
 .include "../../graphics/graphite2/buildlink3.mk"
 .endif
 .endif # HARFBUZZ_BUILDLINK3_MK
diff -r 3f557a9a40aa -r 643907ca4f44 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Sat Jun 08 19:51:38 2019 +0000
+++ b/misc/libreoffice/Makefile Sat Jun 08 19:53:26 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2019/06/02 03:11:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.196 2019/06/08 19:53:26 leot Exp $
 
 VERREL=                6.2.4
 VERRC=         2
@@ -109,8 +109,8 @@
 MORE_DISTFILES2+=              49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
 SITES.49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf=   https://dev-www.libreoffice.org/extern/
 
-.include "../../lang/rust/platform.mk"
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Nn][Oo]) || make(distinfo) || make(mdi)
+.include "../../graphics/librsvg/available.mk"
+.if ${LIBRSVG_TYPE} == "c" || make(distinfo) || make(mdi)
 MORE_DISTFILES2+=              harfbuzz-2.4.0.tar.bz2
 SITES.harfbuzz-2.4.0.tar.bz2=  https://www.freedesktop.org/software/harfbuzz/release/
 .endif
@@ -205,7 +205,7 @@
 # internal sane should be used because only header files are used.
 CONFIGURE_ARGS+=       --without-system-sane
 # Use internal harfbuzz because fonts/harfbuzz has no graphite2 support.
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.if ${LIBRSVG_TYPE} == "rust"
 CONFIGURE_ARGS+=       --with-system-harfbuzz
 CONFIGURE_ARGS+=       --with-system-graphite
 .else
@@ -327,7 +327,7 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 # hardbuzz with graphite2 support is required.
-.if !empty(PLATFORM_SUPPORTS_RUST:M[Yy][Ee][Ss])
+.if ${LIBRSVG_TYPE} == "rust"
 #BUILDLINK_API_DEPENDS.harfbuzz+=      harfbuzz>=1.4.2
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/graphite2/buildlink3.mk"



Home | Main Index | Thread Index | Old Index