Fri Nov 6 15:06:50 2020 UTC ()
Split out ICU integration library from the harfbuzz package.

Only a few pieces of software are using the ICU integration library,
these aren't the big harfbuzz users (i.e. gtk). this is intended to lessen
the impact of icu's frequent ABI breaks.


(nia)
diff -r1.343 -r1.344 pkgsrc/fonts/Makefile
diff -r1.136 -r1.137 pkgsrc/fonts/harfbuzz/Makefile
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz/Makefile.common
diff -r1.44 -r1.45 pkgsrc/fonts/harfbuzz/PLIST
diff -r1.9 -r1.10 pkgsrc/fonts/harfbuzz/options.mk
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/DESCR
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/Makefile
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/PLIST
diff -r0 -r1.1 pkgsrc/fonts/harfbuzz-icu/buildlink3.mk
diff -r1.245 -r1.246 pkgsrc/misc/libreoffice/Makefile
diff -r1.196 -r1.197 pkgsrc/www/webkit-gtk/Makefile

cvs diff -r1.343 -r1.344 pkgsrc/fonts/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/Makefile 2020/08/06 11:08:20 1.343
+++ pkgsrc/fonts/Makefile 2020/11/06 15:06:49 1.344
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.343 2020/08/06 11:08:20 pin Exp $ 1# $NetBSD: Makefile,v 1.344 2020/11/06 15:06:49 nia Exp $
2# 2#
3 3
4COMMENT= Fonts 4COMMENT= Fonts
5 5
6SUBDIR+= AnonymousPro 6SUBDIR+= AnonymousPro
7SUBDIR+= CamingoCode 7SUBDIR+= CamingoCode
8SUBDIR+= Code-New-Roman 8SUBDIR+= Code-New-Roman
9SUBDIR+= CutiveFont 9SUBDIR+= CutiveFont
10SUBDIR+= EB-Garamond 10SUBDIR+= EB-Garamond
11SUBDIR+= FiraCode 11SUBDIR+= FiraCode
12SUBDIR+= Hack-ttf 12SUBDIR+= Hack-ttf
13SUBDIR+= Hasklig 13SUBDIR+= Hasklig
14SUBDIR+= Inter-UI 14SUBDIR+= Inter-UI
@@ -109,26 +109,27 @@ SUBDIR+= freefont-ttf @@ -109,26 +109,27 @@ SUBDIR+= freefont-ttf
109SUBDIR+= freefonts 109SUBDIR+= freefonts
110SUBDIR+= gbdfed 110SUBDIR+= gbdfed
111SUBDIR+= gentium-ttf 111SUBDIR+= gentium-ttf
112SUBDIR+= geoslab703-ttf 112SUBDIR+= geoslab703-ttf
113SUBDIR+= ghostscript-cidfonts 113SUBDIR+= ghostscript-cidfonts
114SUBDIR+= ghostscript-cidfonts-ryumin 114SUBDIR+= ghostscript-cidfonts-ryumin
115SUBDIR+= ghostscript-cmaps 115SUBDIR+= ghostscript-cmaps
116SUBDIR+= ghostscript-fonts 116SUBDIR+= ghostscript-fonts
117SUBDIR+= gnome-font-viewer 117SUBDIR+= gnome-font-viewer
118SUBDIR+= go-ttf 118SUBDIR+= go-ttf
119SUBDIR+= gsftopkk 119SUBDIR+= gsftopkk
120SUBDIR+= gucharmap 120SUBDIR+= gucharmap
121SUBDIR+= harfbuzz 121SUBDIR+= harfbuzz
 122SUBDIR+= harfbuzz-icu
122SUBDIR+= ibm-plex-otf 123SUBDIR+= ibm-plex-otf
123SUBDIR+= ibm-plex-ttf 124SUBDIR+= ibm-plex-ttf
124SUBDIR+= inconsolata-g 125SUBDIR+= inconsolata-g
125SUBDIR+= inconsolata-ttf 126SUBDIR+= inconsolata-ttf
126SUBDIR+= intlfonts 127SUBDIR+= intlfonts
127SUBDIR+= ipaexfont 128SUBDIR+= ipaexfont
128SUBDIR+= ipafont 129SUBDIR+= ipafont
129SUBDIR+= ja-elisat 130SUBDIR+= ja-elisat
130SUBDIR+= ja-elisau 131SUBDIR+= ja-elisau
131SUBDIR+= ja-kaname 132SUBDIR+= ja-kaname
132SUBDIR+= ja-kappa20 133SUBDIR+= ja-kappa20
133SUBDIR+= ja-naga10 134SUBDIR+= ja-naga10
134SUBDIR+= ja-sazanami-ttf 135SUBDIR+= ja-sazanami-ttf

cvs diff -r1.136 -r1.137 pkgsrc/fonts/harfbuzz/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/harfbuzz/Makefile 2020/11/05 09:08:06 1.136
+++ pkgsrc/fonts/harfbuzz/Makefile 2020/11/06 15:06:49 1.137
@@ -1,83 +1,12 @@ @@ -1,83 +1,12 @@
1# $NetBSD: Makefile,v 1.136 2020/11/05 09:08:06 ryoon Exp $ 1# $NetBSD: Makefile,v 1.137 2020/11/06 15:06:49 nia Exp $
2 2
3DISTNAME= harfbuzz-2.7.2 
4PKGREVISION= 1 3PKGREVISION= 1
5CATEGORIES= fonts 
6MASTER_SITES= ${MASTER_SITE_GITHUB:=harfbuzz/} 
7GITHUB_TAG= ${PKGVERSION_NOREV} 
8 4
9MAINTAINER= pkgsrc-users@NetBSD.org 5.include "Makefile.common"
10HOMEPAGE= https://harfbuzz.github.io/ 
11COMMENT= OpenType text shaping engine 
12LICENSE= mit 
13 
14# C++11 
15GCC_REQD+= 4.9 
16 
17.include "../../mk/bsd.prefs.mk" 
18.include "../../graphics/librsvg/available.mk" 
19 
20USE_LANGUAGES= c c++ 
21USE_TOOLS+= pkg-config 
22 
23# cairo/fontconfig are only needed for command line utilities 
24MESON_ARGS+= -Dcairo=disabled 
25MESON_ARGS+= -Dfontconfig=disabled 
26 
27MESON_ARGS+= -Dintrospection=disabled 
28MESON_ARGS+= -Dbenchmark=disabled 
29 
30PLIST_VARS+= graphite2 
31.if ${LIBRSVG_TYPE} == "rust" 
32MESON_ARGS+= -Dgraphite=enabled 
33PLIST.graphite2= yes 
34.else 
35MESON_ARGS+= -Dgraphite=disabled 
36.endif 
37 
38PKGCONFIG_OVERRIDE+= output/meson-private/*.pc 
39 6
40PKGCONFIG_OVERRIDE_STAGE= pre-install 7COMMENT= OpenType text shaping engine
41 
42LDFLAGS.OpenBSD+= -lz 
43 
44.include "options.mk" 
45 
46# gcc too old 
47BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility-inlines-hidden 
48 
49PLIST_VARS+= coretext 
50 
51.if ${OPSYS} == "Darwin" 
52. if !empty(OS_VERSION:M[0-8].*) 
53# MacOS X < 10.5 does not have CoreText. 
54MESON_ARGS+= -Dcoretext=disabled 
55 
56. elif !empty(OS_VERSION:M9.*) 
57# MacOS X 10.5 has CoreText but it's 
58# buggy. CTLineCreateWithAttributedString() seemingly fails when 
59# trying to use a font which isn't installed into the system standard 
60# path. 
61# See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5 
62MESON_ARGS+= -Dcoretext=disabled 
63 
64. else 
65MESON_ARGS+= -Dcoretext=enabled 
66PLIST.coretext= yes 
67. endif 
68.endif 
69 8
70PYTHON_FOR_BUILD_ONLY= tool 9# Use external icu support.
71REPLACE_PYTHON+= src/*.py 10MESON_ARGS+= -Dicu=disabled
72 11
73.include "../../devel/meson/build.mk" 
74.include "../../devel/glib2/buildlink3.mk" 
75.include "../../devel/zlib/buildlink3.mk" 
76#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0 
77#.include "../../graphics/cairo/buildlink3.mk" 
78.include "../../graphics/freetype2/buildlink3.mk" 
79.if ${LIBRSVG_TYPE} == "rust" 
80# graphite2 support breaks graphics/librsvg-c 
81.include "../../graphics/graphite2/buildlink3.mk" 
82.endif 
83.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/fonts/harfbuzz/Makefile.common
# $NetBSD: Makefile.common,v 1.1 2020/11/06 15:06:49 nia Exp $
# used by fonts/harfbuzz-icu/Makefile

DISTNAME=	harfbuzz-2.7.2
CATEGORIES=	fonts
MASTER_SITES=	${MASTER_SITE_GITHUB:=harfbuzz/}
GITHUB_TAG=	${PKGVERSION_NOREV}

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	https://harfbuzz.github.io/
LICENSE=	mit

WRKSRC=		${WRKDIR}/${DISTNAME}

DISTINFO_FILE=	${.CURDIR}/../../fonts/harfbuzz/distinfo
#PATCHDIR=	${.CURDIR}/../../fonts/harfbuzz/patches

# C++11
GCC_REQD+=	4.9

.include "../../mk/bsd.prefs.mk"
.include "../../graphics/librsvg/available.mk"

USE_LANGUAGES=	c c++
USE_TOOLS+=	pkg-config

# cairo/fontconfig are only needed for command line utilities
MESON_ARGS+=	-Dcairo=disabled
MESON_ARGS+=	-Dfontconfig=disabled

MESON_ARGS+=	-Dintrospection=disabled
MESON_ARGS+=	-Dbenchmark=disabled

PLIST_VARS+=		graphite2
.if ${LIBRSVG_TYPE} == "rust"
MESON_ARGS+=		-Dgraphite=enabled
PLIST.graphite2=	yes
.else
MESON_ARGS+=		-Dgraphite=disabled
.endif

PKGCONFIG_OVERRIDE+=	output/meson-private/*.pc

PKGCONFIG_OVERRIDE_STAGE=	pre-install

LDFLAGS.OpenBSD+=	-lz

.include "../../fonts/harfbuzz/options.mk"

# gcc too old
BUILDLINK_TRANSFORM.MirBSD+=	rm:-fvisibility-inlines-hidden

PLIST_VARS+=	coretext

.if ${OPSYS} == "Darwin"
.  if !empty(OS_VERSION:M[0-8].*)
# MacOS X < 10.5 does not have CoreText.
MESON_ARGS+=		-Dcoretext=disabled

.  elif !empty(OS_VERSION:M9.*)
# MacOS X 10.5 has CoreText but it's
# buggy. CTLineCreateWithAttributedString() seemingly fails when
# trying to use a font which isn't installed into the system standard
# path.
# See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5
MESON_ARGS+=		-Dcoretext=disabled

.  else
MESON_ARGS+=		-Dcoretext=enabled
PLIST.coretext=		yes
.  endif
.endif

PYTHON_FOR_BUILD_ONLY=	tool
REPLACE_PYTHON+=	src/*.py

.include "../../devel/meson/build.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
#BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.8.0
#.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.if ${LIBRSVG_TYPE} == "rust"
# graphite2 support breaks graphics/librsvg-c
.include "../../graphics/graphite2/buildlink3.mk"
.endif

cvs diff -r1.44 -r1.45 pkgsrc/fonts/harfbuzz/PLIST (expand / switch to unified diff)

--- pkgsrc/fonts/harfbuzz/PLIST 2020/09/04 10:50:08 1.44
+++ pkgsrc/fonts/harfbuzz/PLIST 2020/11/06 15:06:49 1.45
@@ -1,70 +1,65 @@ @@ -1,70 +1,65 @@
1@comment $NetBSD: PLIST,v 1.44 2020/09/04 10:50:08 prlw1 Exp $ 1@comment $NetBSD: PLIST,v 1.45 2020/11/06 15:06:49 nia Exp $
2bin/hb-ot-shape-closure 2bin/hb-ot-shape-closure
3bin/hb-shape 3bin/hb-shape
4bin/hb-subset 4bin/hb-subset
5include/harfbuzz/hb-aat-layout.h 5include/harfbuzz/hb-aat-layout.h
6include/harfbuzz/hb-aat.h 6include/harfbuzz/hb-aat.h
7include/harfbuzz/hb-blob.h 7include/harfbuzz/hb-blob.h
8include/harfbuzz/hb-buffer.h 8include/harfbuzz/hb-buffer.h
9include/harfbuzz/hb-common.h 9include/harfbuzz/hb-common.h
10${PLIST.coretext}include/harfbuzz/hb-coretext.h 10${PLIST.coretext}include/harfbuzz/hb-coretext.h
11include/harfbuzz/hb-deprecated.h 11include/harfbuzz/hb-deprecated.h
12include/harfbuzz/hb-draw.h 12include/harfbuzz/hb-draw.h
13include/harfbuzz/hb-face.h 13include/harfbuzz/hb-face.h
14include/harfbuzz/hb-font.h 14include/harfbuzz/hb-font.h
15include/harfbuzz/hb-ft.h 15include/harfbuzz/hb-ft.h
16include/harfbuzz/hb-glib.h 16include/harfbuzz/hb-glib.h
17include/harfbuzz/hb-gobject-enums.h 17include/harfbuzz/hb-gobject-enums.h
18include/harfbuzz/hb-gobject-structs.h 18include/harfbuzz/hb-gobject-structs.h
19include/harfbuzz/hb-gobject.h 19include/harfbuzz/hb-gobject.h
20${PLIST.graphite2}include/harfbuzz/hb-graphite2.h 20${PLIST.graphite2}include/harfbuzz/hb-graphite2.h
21${PLIST.icu}include/harfbuzz/hb-icu.h 
22include/harfbuzz/hb-map.h 21include/harfbuzz/hb-map.h
23include/harfbuzz/hb-ot-color.h 22include/harfbuzz/hb-ot-color.h
24include/harfbuzz/hb-ot-deprecated.h 23include/harfbuzz/hb-ot-deprecated.h
25include/harfbuzz/hb-ot-font.h 24include/harfbuzz/hb-ot-font.h
26include/harfbuzz/hb-ot-layout.h 25include/harfbuzz/hb-ot-layout.h
27include/harfbuzz/hb-ot-math.h 26include/harfbuzz/hb-ot-math.h
28include/harfbuzz/hb-ot-meta.h 27include/harfbuzz/hb-ot-meta.h
29include/harfbuzz/hb-ot-metrics.h 28include/harfbuzz/hb-ot-metrics.h
30include/harfbuzz/hb-ot-name.h 29include/harfbuzz/hb-ot-name.h
31include/harfbuzz/hb-ot-shape.h 30include/harfbuzz/hb-ot-shape.h
32include/harfbuzz/hb-ot-var.h 31include/harfbuzz/hb-ot-var.h
33include/harfbuzz/hb-ot.h 32include/harfbuzz/hb-ot.h
34include/harfbuzz/hb-set.h 33include/harfbuzz/hb-set.h
35include/harfbuzz/hb-shape-plan.h 34include/harfbuzz/hb-shape-plan.h
36include/harfbuzz/hb-shape.h 35include/harfbuzz/hb-shape.h
37include/harfbuzz/hb-style.h 36include/harfbuzz/hb-style.h
38include/harfbuzz/hb-subset.h 37include/harfbuzz/hb-subset.h
39include/harfbuzz/hb-unicode.h 38include/harfbuzz/hb-unicode.h
40include/harfbuzz/hb-version.h 39include/harfbuzz/hb-version.h
41include/harfbuzz/hb.h 40include/harfbuzz/hb.h
42lib/cmake/harfbuzz/harfbuzz-config.cmake 41lib/cmake/harfbuzz/harfbuzz-config.cmake
43${PLIST.introspection}lib/girepository-1.0/HarfBuzz-0.0.typelib 42${PLIST.introspection}lib/girepository-1.0/HarfBuzz-0.0.typelib
44lib/libharfbuzz-gobject.so 43lib/libharfbuzz-gobject.so
45lib/libharfbuzz-gobject.so.0 44lib/libharfbuzz-gobject.so.0
46lib/libharfbuzz-gobject.so.0.20702.0 45lib/libharfbuzz-gobject.so.0.20702.0
47${PLIST.icu}lib/libharfbuzz-icu.so 
48${PLIST.icu}lib/libharfbuzz-icu.so.0 
49${PLIST.icu}lib/libharfbuzz-icu.so.0.20702.0 
50lib/libharfbuzz-subset.so 46lib/libharfbuzz-subset.so
51lib/libharfbuzz-subset.so.0 47lib/libharfbuzz-subset.so.0
52lib/libharfbuzz-subset.so.0.20702.0 48lib/libharfbuzz-subset.so.0.20702.0
53lib/libharfbuzz.so 49lib/libharfbuzz.so
54lib/libharfbuzz.so.0 50lib/libharfbuzz.so.0
55lib/libharfbuzz.so.0.20702.0 51lib/libharfbuzz.so.0.20702.0
56lib/pkgconfig/harfbuzz-gobject.pc 52lib/pkgconfig/harfbuzz-gobject.pc
57${PLIST.icu}lib/pkgconfig/harfbuzz-icu.pc 
58lib/pkgconfig/harfbuzz-subset.pc 53lib/pkgconfig/harfbuzz-subset.pc
59lib/pkgconfig/harfbuzz.pc 54lib/pkgconfig/harfbuzz.pc
60${PLIST.introspection}share/gir-1.0/HarfBuzz-0.0.gir 55${PLIST.introspection}share/gir-1.0/HarfBuzz-0.0.gir
61${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.png 56${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.png
62${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.svg 57${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.svg
63${PLIST.doc}share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html 58${PLIST.doc}share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html
64${PLIST.doc}share/gtk-doc/html/harfbuzz/aat-shaping.html 59${PLIST.doc}share/gtk-doc/html/harfbuzz/aat-shaping.html
65${PLIST.doc}share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html 60${PLIST.doc}share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html
66${PLIST.doc}share/gtk-doc/html/harfbuzz/annotation-glossary.html 61${PLIST.doc}share/gtk-doc/html/harfbuzz/annotation-glossary.html
67${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-full.html 62${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-full.html
68${PLIST.doc}share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html 63${PLIST.doc}share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
69${PLIST.doc}share/gtk-doc/html/harfbuzz/building.html 64${PLIST.doc}share/gtk-doc/html/harfbuzz/building.html
70${PLIST.doc}share/gtk-doc/html/harfbuzz/ch01s03.html 65${PLIST.doc}share/gtk-doc/html/harfbuzz/ch01s03.html

cvs diff -r1.9 -r1.10 pkgsrc/fonts/harfbuzz/options.mk (expand / switch to unified diff)

--- pkgsrc/fonts/harfbuzz/options.mk 2020/09/04 10:50:08 1.9
+++ pkgsrc/fonts/harfbuzz/options.mk 2020/11/06 15:06:49 1.10
@@ -1,34 +1,26 @@ @@ -1,34 +1,26 @@
1# $NetBSD: options.mk,v 1.9 2020/09/04 10:50:08 prlw1 Exp $ 1# $NetBSD: options.mk,v 1.10 2020/11/06 15:06:49 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.harfbuzz 3PKG_OPTIONS_VAR= PKG_OPTIONS.harfbuzz
4PKG_SUPPORTED_OPTIONS+= doc icu introspection 4PKG_SUPPORTED_OPTIONS+= doc introspection
5PKG_SUGGESTED_OPTIONS= doc icu introspection 5PKG_SUGGESTED_OPTIONS= doc introspection
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= doc icu introspection 9PLIST_VARS+= doc introspection
10 10
11.if !empty(PKG_OPTIONS:Mdoc) 11.if !empty(PKG_OPTIONS:Mdoc)
12MESON_ARGS+= -Ddocs=enabled 12MESON_ARGS+= -Ddocs=enabled
13.include "../../textproc/gtk-doc/buildlink3.mk" 13.include "../../textproc/gtk-doc/buildlink3.mk"
14PLIST.doc= yes 14PLIST.doc= yes
15.else 15.else
16MESON_ARGS+= -Ddocs=disabled 16MESON_ARGS+= -Ddocs=disabled
17.endif 17.endif
18 18
19.if !empty(PKG_OPTIONS:Micu) 
20.include "../../textproc/icu/buildlink3.mk" 
21MESON_ARGS+= -Dicu=enabled 
22PLIST.icu= yes 
23.else 
24MESON_ARGS+= -Dicu=disabled 
25.endif 
26 
27.if !empty(PKG_OPTIONS:Mintrospection) 19.if !empty(PKG_OPTIONS:Mintrospection)
28BUILDLINK_DEPMETHOD.gobject-introspection+= build 20BUILDLINK_DEPMETHOD.gobject-introspection+= build
29.include "../../devel/gobject-introspection/buildlink3.mk" 21.include "../../devel/gobject-introspection/buildlink3.mk"
30MESON_ARGS+= -Dintrospection=enabled 22MESON_ARGS+= -Dintrospection=enabled
31PLIST.introspection= yes 23PLIST.introspection= yes
32.else 24.else
33MESON_ARGS+= -Dintrospection=disabled 25MESON_ARGS+= -Dintrospection=disabled
34.endif 26.endif

File Added: pkgsrc/fonts/harfbuzz-icu/DESCR
International Components for Unicode integration for HarfBuzz

File Added: pkgsrc/fonts/harfbuzz-icu/Makefile
# $NetBSD: Makefile,v 1.1 2020/11/06 15:06:49 nia Exp $

# XXX: hack to override meson installation
INSTALL_DIRS=

.include "../../fonts/harfbuzz/Makefile.common"

PKGNAME=	${DISTNAME:S/^harfbuzz-/harfbuzz-icu-/1}

COMMENT=	OpenType text shaping engine (ICU integration)

MESON_ARGS+=	-Dicu=enabled

INSTALLATION_DIRS+=	include/harfbuzz
INSTALLATION_DIRS+=	lib
INSTALLATION_DIRS+=	lib/pkgconfig

HARFBUZZ_ICU_LIBNAME=	libharfbuzz-icu.so.0.20702.0

.PHONY: harfbuzz-icu-install

harfbuzz-icu-install:
	${INSTALL_DATA} ${WRKSRC}/src/hb-icu.h \
	    ${DESTDIR}${PREFIX}/include/harfbuzz/hb-icu.h
	${INSTALL_DATA} ${WRKSRC}/output/meson-private/harfbuzz-icu.pc \
	    ${DESTDIR}${PREFIX}/lib/pkgconfig/harfbuzz-icu.pc
	${INSTALL_LIB} ${WRKSRC}/output/src/${HARFBUZZ_ICU_LIBNAME} \
	    ${DESTDIR}${PREFIX}/lib
	cd ${DESTDIR}${PREFIX}/lib && ${LN} -s ${HARFBUZZ_ICU_LIBNAME} libharfbuzz-icu.so.0
	cd ${DESTDIR}${PREFIX}/lib && ${LN} -s ${HARFBUZZ_ICU_LIBNAME} libharfbuzz-icu.so

do-install: harfbuzz-icu-install

.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/fonts/harfbuzz-icu/PLIST
@comment $NetBSD: PLIST,v 1.1 2020/11/06 15:06:49 nia Exp $
include/harfbuzz/hb-icu.h
lib/libharfbuzz-icu.so
lib/libharfbuzz-icu.so.0
lib/libharfbuzz-icu.so.0.20702.0
lib/pkgconfig/harfbuzz-icu.pc

File Added: pkgsrc/fonts/harfbuzz-icu/buildlink3.mk
# $NetBSD: buildlink3.mk,v 1.1 2020/11/06 15:06:49 nia Exp $

BUILDLINK_TREE+=	harfbuzz-icu

.if !defined(HARFBUZZ_ICU_BUILDLINK3_MK)
HARFBUZZ_ICU_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.harfbuzz-icu+=	harfbuzz-icu>=2.1.1
BUILDLINK_ABI_DEPENDS.harfbuzz-icu+=	harfbuzz-icu>=2.6.4nb2

.include "../../fonts/harfbuzz/buildlink3.mk"
.endif	# HARFBUZZ_ICU_BUILDLINK3_MK

BUILDLINK_TREE+=	-harfbuzz-icu

cvs diff -r1.245 -r1.246 pkgsrc/misc/libreoffice/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/Makefile 2020/11/05 09:08:42 1.245
+++ pkgsrc/misc/libreoffice/Makefile 2020/11/06 15:06:49 1.246
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.245 2020/11/05 09:08:42 ryoon Exp $ 1# $NetBSD: Makefile,v 1.246 2020/11/06 15:06:49 nia Exp $
2 2
3VERREL= 7.0.3 3VERREL= 7.0.3
4VERRC= 1 4VERRC= 1
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7PKGREVISION= 3 7PKGREVISION= 4
8CATEGORIES= misc 8CATEGORIES= misc
9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= https://www.libreoffice.org/ 13HOMEPAGE= https://www.libreoffice.org/
14COMMENT= Office productivity suite from The Document Foundation 14COMMENT= Office productivity suite from The Document Foundation
15LICENSE= gnu-lgpl-v3 15LICENSE= gnu-lgpl-v3
16 16
17UNLIMIT_RESOURCES+= cputime 17UNLIMIT_RESOURCES+= cputime
18 18
19USE_LANGUAGES= c gnu++17 19USE_LANGUAGES= c gnu++17
20 20
@@ -340,26 +340,27 @@ BUILDLINK_API_DEPENDS.libetonyek+= libet @@ -340,26 +340,27 @@ BUILDLINK_API_DEPENDS.libetonyek+= libet
340.include "../../devel/boost-libs/buildlink3.mk" 340.include "../../devel/boost-libs/buildlink3.mk"
341.include "../../devel/cppunit/buildlink3.mk" 341.include "../../devel/cppunit/buildlink3.mk"
342.include "../../devel/gperf/buildlink3.mk" 342.include "../../devel/gperf/buildlink3.mk"
343.include "../../devel/libexecinfo/buildlink3.mk" 343.include "../../devel/libexecinfo/buildlink3.mk"
344.include "../../devel/liblangtag/buildlink3.mk" 344.include "../../devel/liblangtag/buildlink3.mk"
345.include "../../devel/mdds/buildlink3.mk" 345.include "../../devel/mdds/buildlink3.mk"
346.include "../../devel/nss/buildlink3.mk" 346.include "../../devel/nss/buildlink3.mk"
347.include "../../devel/zlib/buildlink3.mk" 347.include "../../devel/zlib/buildlink3.mk"
348.include "../../fonts/fontconfig/buildlink3.mk" 348.include "../../fonts/fontconfig/buildlink3.mk"
349# harfbuzz with graphite2 support is required. 349# harfbuzz with graphite2 support is required.
350.if ${LIBRSVG_TYPE} == "rust" 350.if ${LIBRSVG_TYPE} == "rust"
351#BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=1.4.2 351#BUILDLINK_API_DEPENDS.harfbuzz+= harfbuzz>=1.4.2
352.include "../../fonts/harfbuzz/buildlink3.mk" 352.include "../../fonts/harfbuzz/buildlink3.mk"
 353.include "../../fonts/harfbuzz-icu/buildlink3.mk"
353.include "../../graphics/graphite2/buildlink3.mk" 354.include "../../graphics/graphite2/buildlink3.mk"
354.endif 355.endif
355# Requires JCS_EXT_BGRA 356# Requires JCS_EXT_BGRA
356#.include "../../mk/jpeg.buildlink3.mk" 357#.include "../../mk/jpeg.buildlink3.mk"
357.include "../../graphics/cairo/buildlink3.mk" 358.include "../../graphics/cairo/buildlink3.mk"
358.include "../../graphics/freetype2/buildlink3.mk" 359.include "../../graphics/freetype2/buildlink3.mk"
359.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk" 360.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
360.include "../../graphics/glew/buildlink3.mk" 361.include "../../graphics/glew/buildlink3.mk"
361.include "../../graphics/glu/buildlink3.mk" 362.include "../../graphics/glu/buildlink3.mk"
362.include "../../graphics/glm/buildlink3.mk" 363.include "../../graphics/glm/buildlink3.mk"
363.include "../../graphics/lcms2/buildlink3.mk" 364.include "../../graphics/lcms2/buildlink3.mk"
364.include "../../graphics/libepoxy/buildlink3.mk" 365.include "../../graphics/libepoxy/buildlink3.mk"
365.include "../../graphics/librsvg/buildlink3.mk" 366.include "../../graphics/librsvg/buildlink3.mk"

cvs diff -r1.196 -r1.197 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2020/11/05 09:07:13 1.196
+++ pkgsrc/www/webkit-gtk/Makefile 2020/11/06 15:06:49 1.197
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.196 2020/11/05 09:07:13 ryoon Exp $ 1# $NetBSD: Makefile,v 1.197 2020/11/06 15:06:49 nia Exp $
2 2
3DISTNAME= webkitgtk-2.30.2 3DISTNAME= webkitgtk-2.30.2
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://www.webkitgtk.org/releases/ 7MASTER_SITES= https://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.webkitgtk.org/ 11HOMEPAGE= https://www.webkitgtk.org/
12COMMENT= GTK port of the WebKit browser engine 12COMMENT= GTK port of the WebKit browser engine
13LICENSE= 2-clause-bsd AND gnu-lgpl-v2 13LICENSE= 2-clause-bsd AND gnu-lgpl-v2
14 14
15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
16NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 16NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
17 17
18TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 18TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
@@ -123,26 +123,27 @@ CFLAGS+= -DRELEASE_WITHOUT_OPTIMIZATIONS @@ -123,26 +123,27 @@ CFLAGS+= -DRELEASE_WITHOUT_OPTIMIZATIONS
123 123
124# Needed for JavaScript JIT 124# Needed for JavaScript JIT
125NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/WebKitWebProcess 125NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/WebKitWebProcess
126NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/jsc 126NOT_PAX_MPROTECT_SAFE+= libexec/webkit2gtk-4.0/jsc
127 127
128.include "options.mk" 128.include "options.mk"
129 129
130BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 130BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
131.include "../../devel/glib2/buildlink3.mk" 131.include "../../devel/glib2/buildlink3.mk"
132.include "../../devel/zlib/buildlink3.mk" 132.include "../../devel/zlib/buildlink3.mk"
133.include "../../databases/sqlite3/buildlink3.mk" 133.include "../../databases/sqlite3/buildlink3.mk"
134.include "../../devel/gperf/buildlink3.mk" 134.include "../../devel/gperf/buildlink3.mk"
135.include "../../devel/pango/buildlink3.mk" 135.include "../../devel/pango/buildlink3.mk"
 136.include "../../fonts/harfbuzz-icu/buildlink3.mk"
136.include "../../fonts/woff2/buildlink3.mk" 137.include "../../fonts/woff2/buildlink3.mk"
137.include "../../graphics/cairo-gobject/buildlink3.mk" 138.include "../../graphics/cairo-gobject/buildlink3.mk"
138.include "../../graphics/freetype2/buildlink3.mk" 139.include "../../graphics/freetype2/buildlink3.mk"
139.include "../../graphics/libwebp/buildlink3.mk" 140.include "../../graphics/libwebp/buildlink3.mk"
140.include "../../mk/jpeg.buildlink3.mk" 141.include "../../mk/jpeg.buildlink3.mk"
141BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08 142BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
142.include "../../graphics/png/buildlink3.mk" 143.include "../../graphics/png/buildlink3.mk"
143BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3 144BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3
144.include "../../multimedia/gstreamer1/buildlink3.mk" 145.include "../../multimedia/gstreamer1/buildlink3.mk"
145BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3 146BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
146.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 147.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
147BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 148BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
148.include "../../net/libsoup/buildlink3.mk" 149.include "../../net/libsoup/buildlink3.mk"