Index: head/x11-fonts/Makefile =================================================================== --- head/x11-fonts/Makefile (revision 522081) +++ head/x11-fonts/Makefile (revision 522082) @@ -1,243 +1,244 @@ # $FreeBSD$ # COMMENT = X11 fonts and font utilities SUBDIR += 3270font SUBDIR += Hasklig SUBDIR += alef SUBDIR += alegreya SUBDIR += alegreya-sans SUBDIR += alfont SUBDIR += andika SUBDIR += anonymous-pro SUBDIR += apl385 SUBDIR += artwiz-aleczapka SUBDIR += artwiz-aleczapka-de SUBDIR += artwiz-aleczapka-se SUBDIR += artwiz-fonts SUBDIR += averiagwf SUBDIR += b612 SUBDIR += bdfresize SUBDIR += bdftopcf SUBDIR += bitstream-vera SUBDIR += bitter SUBDIR += blackout SUBDIR += c64bdf SUBDIR += cantarell-fonts SUBDIR += cascadia-code SUBDIR += charis SUBDIR += charis-compact SUBDIR += clearsans SUBDIR += code2000 SUBDIR += comfortaa-ttf SUBDIR += comic-neue SUBDIR += consolamono-ttf SUBDIR += courier-prime SUBDIR += croscorefonts-fonts-ttf SUBDIR += crosextrafonts-caladea-ttf SUBDIR += crosextrafonts-carlito-ttf SUBDIR += cyberbit-ttfonts SUBDIR += cyr-rfx SUBDIR += datalegreya SUBDIR += dejavu SUBDIR += dina SUBDIR += doulos SUBDIR += doulos-compact SUBDIR += droid-fonts-ttf SUBDIR += encodings SUBDIR += exo SUBDIR += fantasque-sans-mono SUBDIR += fanwood SUBDIR += farsifonts SUBDIR += fifteen SUBDIR += fira SUBDIR += firacode SUBDIR += firago SUBDIR += fntsample SUBDIR += font-adobe-100dpi SUBDIR += font-adobe-75dpi SUBDIR += font-adobe-utopia-100dpi SUBDIR += font-adobe-utopia-75dpi SUBDIR += font-adobe-utopia-type1 SUBDIR += font-alias SUBDIR += font-arabic-misc SUBDIR += font-awesome SUBDIR += font-bh-100dpi SUBDIR += font-bh-75dpi SUBDIR += font-bh-lucidatypewriter-100dpi SUBDIR += font-bh-lucidatypewriter-75dpi SUBDIR += font-bh-ttf SUBDIR += font-bh-type1 SUBDIR += font-bitstream-100dpi SUBDIR += font-bitstream-75dpi SUBDIR += font-bitstream-type1 SUBDIR += font-cronyx-cyrillic SUBDIR += font-cursor-misc SUBDIR += font-daewoo-misc SUBDIR += font-dec-misc SUBDIR += font-gost SUBDIR += font-ibm-type1 SUBDIR += font-isas-misc SUBDIR += font-jis-misc SUBDIR += font-manager SUBDIR += font-micro-misc SUBDIR += font-misc-cyrillic SUBDIR += font-misc-ethiopic SUBDIR += font-misc-meltho SUBDIR += font-misc-misc SUBDIR += font-mutt-misc SUBDIR += font-schumacher-misc SUBDIR += font-screen-cyrillic SUBDIR += font-sony-misc SUBDIR += font-sun-misc SUBDIR += font-tex-gyre-bonum-math SUBDIR += font-tex-gyre-pagella-math SUBDIR += font-tex-gyre-schola-math SUBDIR += font-tex-gyre-termes-math SUBDIR += font-util SUBDIR += font-winitzki-cyrillic SUBDIR += font-xfree86-type1 SUBDIR += fontconfig SUBDIR += fontconfig-reference SUBDIR += fontmatrix SUBDIR += fonts-indic SUBDIR += fonttosfnt SUBDIR += freefont-ttf SUBDIR += freefonts SUBDIR += fslsfonts SUBDIR += gbdfed SUBDIR += geminifonts SUBDIR += gentium-basic SUBDIR += gentium-plus SUBDIR += gnu-unifont SUBDIR += gnu-unifont-ttf SUBDIR += gofont-ttf SUBDIR += gohufont SUBDIR += google-fonts SUBDIR += hack-font SUBDIR += hanazono-fonts-ttf SUBDIR += hermit SUBDIR += inconsolata-lgc-ttf SUBDIR += inconsolata-ttf SUBDIR += intlfonts SUBDIR += iosevka SUBDIR += isabella SUBDIR += jmk-x11-fonts SUBDIR += junction SUBDIR += junicode SUBDIR += kaputa SUBDIR += khmeros SUBDIR += lato SUBDIR += league-gothic SUBDIR += league-spartan SUBDIR += lfpfonts-fix SUBDIR += lfpfonts-var SUBDIR += libFS SUBDIR += libXfont SUBDIR += libXfont2 SUBDIR += libXft SUBDIR += liberation-fonts-ttf SUBDIR += libfontenc SUBDIR += linden-hill SUBDIR += linux-c7-fontconfig SUBDIR += linuxlibertine SUBDIR += linuxlibertine-g SUBDIR += lohit SUBDIR += manu-gothica SUBDIR += material-icons-ttf SUBDIR += materialdesign-ttf SUBDIR += meslo SUBDIR += mgopen SUBDIR += mkbold SUBDIR += mkbold-mkitalic SUBDIR += mkfontscale SUBDIR += mkitalic SUBDIR += mondulkiri SUBDIR += monoid SUBDIR += montecarlo_fonts SUBDIR += montserrat SUBDIR += moveable-type-fonts SUBDIR += nerd-fonts SUBDIR += nexfontsel SUBDIR += noto SUBDIR += noto-basic SUBDIR += noto-extra SUBDIR += noto-jp SUBDIR += noto-kr SUBDIR += noto-sc SUBDIR += noto-tc SUBDIR += nucleus SUBDIR += ohsnap SUBDIR += oldschool-pc-fonts SUBDIR += open-sans SUBDIR += orbitron + SUBDIR += ots SUBDIR += oxygen-fonts SUBDIR += p5-Font-AFM SUBDIR += p5-Font-TTF SUBDIR += p5-Font-TTFMetrics SUBDIR += p5-type1inst SUBDIR += padauk SUBDIR += paratype SUBDIR += pcf2bdf SUBDIR += plex-ttf SUBDIR += powerline-fonts SUBDIR += prociono SUBDIR += profont SUBDIR += proggy_fonts SUBDIR += proggy_fonts-ttf SUBDIR += psftools SUBDIR += py-QtAwesome SUBDIR += py-bdflib SUBDIR += py-booleanOperations SUBDIR += py-compreffor SUBDIR += py-cu2qu SUBDIR += py-defcon SUBDIR += py-fontMath SUBDIR += py-fontmake SUBDIR += py-glyphsLib SUBDIR += py-ufo2ft SUBDIR += py-ufoLib SUBDIR += raleway SUBDIR += roboto-fonts-ttf SUBDIR += sgifonts SUBDIR += sharefonts SUBDIR += showfont SUBDIR += sourcecodepro-ttf SUBDIR += sourcesanspro-ttf SUBDIR += sourceserifpro-ttf SUBDIR += spleen SUBDIR += stix-fonts SUBDIR += sudo-font SUBDIR += suxus SUBDIR += symbola SUBDIR += tamsyn SUBDIR += tamzen SUBDIR += terminus-font SUBDIR += terminus-ttf SUBDIR += tkfont SUBDIR += tlwg-ttf SUBDIR += tmu SUBDIR += tv-fonts SUBDIR += twemoji-color-font-ttf SUBDIR += ubuntu-font SUBDIR += urwfonts SUBDIR += urwfonts-ttf SUBDIR += uw-ttyp0 SUBDIR += vollkorn-ttf SUBDIR += vtfontcvt-ng SUBDIR += webfonts SUBDIR += wqy SUBDIR += xfontsel SUBDIR += xfs SUBDIR += xfsinfo SUBDIR += xlsfonts SUBDIR += xorg-fonts SUBDIR += xorg-fonts-100dpi SUBDIR += xorg-fonts-75dpi SUBDIR += xorg-fonts-cyrillic SUBDIR += xorg-fonts-miscbitmaps SUBDIR += xorg-fonts-truetype SUBDIR += xorg-fonts-type1 .include Index: head/x11-fonts/ots/Makefile =================================================================== --- head/x11-fonts/ots/Makefile (nonexistent) +++ head/x11-fonts/ots/Makefile (revision 522082) @@ -0,0 +1,40 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= ots +PORTVERSION= 8.0.0 +DISTVERSIONPREFIX= v +CATEGORIES= x11-fonts + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= OpenType Sanitizer + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ + libfreetype.so:print/freetype2 \ + libgtest.so:devel/googletest \ + liblz4.so:archivers/liblz4 \ + libwoff2dec.so:devel/woff2 + +USES= compiler:c++11-lang meson pkgconfig shebangfix + +MESON_FALSE= debug +MESON_TRUE= graphite + +GH_ACCOUNT= khaledhosny +USE_GITHUB= yes + +SHEBANG_FILES= tests/*.sh +bash_CMD= ${SH} + +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/meson.build + +do-test: + ${SETENV} top_builddir=${BUILD_WRKSRC} top_srcdir=${WRKSRC} ${SH} ${WRKSRC}/tests/test_bad_fonts.sh + ${SETENV} top_builddir=${BUILD_WRKSRC} top_srcdir=${WRKSRC} ${SH} ${WRKSRC}/tests/test_fuzzed_fonts.sh + ${SETENV} top_builddir=${BUILD_WRKSRC} top_srcdir=${WRKSRC} ${SH} ${WRKSRC}/tests/test_good_fonts.sh + +.include Property changes on: head/x11-fonts/ots/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fonts/ots/distinfo =================================================================== --- head/x11-fonts/ots/distinfo (nonexistent) +++ head/x11-fonts/ots/distinfo (revision 522082) @@ -0,0 +1,3 @@ +TIMESTAMP = 1578125669 +SHA256 (khaledhosny-ots-v8.0.0_GH0.tar.gz) = ced587c1df08fe72d7d5080e3c43f07f80eabca7bde9b31d74a6158ee8be2690 +SIZE (khaledhosny-ots-v8.0.0_GH0.tar.gz) = 28644271 Property changes on: head/x11-fonts/ots/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fonts/ots/files/patch-meson.build =================================================================== --- head/x11-fonts/ots/files/patch-meson.build (nonexistent) +++ head/x11-fonts/ots/files/patch-meson.build (revision 522082) @@ -0,0 +1,183 @@ +--- meson.build.orig 2019-08-30 08:38:31 UTC ++++ meson.build +@@ -1,6 +1,6 @@ + project('ots', 'c', 'cpp', + version: '8.0.0', +- default_options : ['cpp_std=c++11', 'default_library=static'], ++ default_options : ['cpp_std=c++11', 'default_library=both'], + ) + + cxx = meson.get_compiler('cpp') +@@ -38,52 +38,52 @@ configure_file(output: 'config.h', + configuration: conf) + + +-brotli_includes = ['third_party/brotli/c/include'] +-libbrotli = library('brotli', +- 'third_party/brotli/c/common/constants.h', +- 'third_party/brotli/c/common/dictionary.c', +- 'third_party/brotli/c/common/dictionary.h', +- 'third_party/brotli/c/common/transform.c', +- 'third_party/brotli/c/common/transform.h', +- 'third_party/brotli/c/common/version.h', +- 'third_party/brotli/c/dec/bit_reader.c', +- 'third_party/brotli/c/dec/bit_reader.h', +- 'third_party/brotli/c/dec/decode.c', +- 'third_party/brotli/c/dec/huffman.c', +- 'third_party/brotli/c/dec/huffman.h', +- 'third_party/brotli/c/dec/prefix.h', +- 'third_party/brotli/c/dec/state.c', +- 'third_party/brotli/c/dec/state.h', +- 'third_party/brotli/c/include/brotli/decode.h', +- 'third_party/brotli/c/include/brotli/port.h', +- 'third_party/brotli/c/include/brotli/types.h', +- include_directories: include_directories(brotli_includes), +-) ++#brotli_includes = ['third_party/brotli/c/include'] ++#libbrotli = library('brotli', ++# 'third_party/brotli/c/common/constants.h', ++# 'third_party/brotli/c/common/dictionary.c', ++# 'third_party/brotli/c/common/dictionary.h', ++# 'third_party/brotli/c/common/transform.c', ++# 'third_party/brotli/c/common/transform.h', ++# 'third_party/brotli/c/common/version.h', ++# 'third_party/brotli/c/dec/bit_reader.c', ++# 'third_party/brotli/c/dec/bit_reader.h', ++# 'third_party/brotli/c/dec/decode.c', ++# 'third_party/brotli/c/dec/huffman.c', ++# 'third_party/brotli/c/dec/huffman.h', ++# 'third_party/brotli/c/dec/prefix.h', ++# 'third_party/brotli/c/dec/state.c', ++# 'third_party/brotli/c/dec/state.h', ++# 'third_party/brotli/c/include/brotli/decode.h', ++# 'third_party/brotli/c/include/brotli/port.h', ++# 'third_party/brotli/c/include/brotli/types.h', ++# include_directories: include_directories(brotli_includes), ++#) + + +-woff2_includes = ['third_party/brotli/c/include', 'third_party/woff2/include'] +-libwoff2 = library('woff2', +- 'third_party/woff2/include/woff2/decode.h', +- 'third_party/woff2/include/woff2/output.h', +- 'third_party/woff2/src/buffer.h', +- 'third_party/woff2/src/port.h', +- 'third_party/woff2/src/round.h', +- 'third_party/woff2/src/store_bytes.h', +- 'third_party/woff2/src/table_tags.cc', +- 'third_party/woff2/src/table_tags.h', +- 'third_party/woff2/src/variable_length.cc', +- 'third_party/woff2/src/variable_length.h', +- 'third_party/woff2/src/woff2_common.cc', +- 'third_party/woff2/src/woff2_common.h', +- 'third_party/woff2/src/woff2_dec.cc', +- 'third_party/woff2/src/woff2_out.cc', +- include_directories: include_directories(woff2_includes), +-) ++#woff2_includes = ['third_party/brotli/c/include', 'third_party/woff2/include'] ++#libwoff2 = library('woff2', ++# 'third_party/woff2/include/woff2/decode.h', ++# 'third_party/woff2/include/woff2/output.h', ++# 'third_party/woff2/src/buffer.h', ++# 'third_party/woff2/src/port.h', ++# 'third_party/woff2/src/round.h', ++# 'third_party/woff2/src/store_bytes.h', ++# 'third_party/woff2/src/table_tags.cc', ++# 'third_party/woff2/src/table_tags.h', ++# 'third_party/woff2/src/variable_length.cc', ++# 'third_party/woff2/src/variable_length.h', ++# 'third_party/woff2/src/woff2_common.cc', ++# 'third_party/woff2/src/woff2_common.h', ++# 'third_party/woff2/src/woff2_dec.cc', ++# 'third_party/woff2/src/woff2_out.cc', ++# include_directories: include_directories(woff2_includes), ++#) + + + ots_includes = [ + 'include', +- 'third_party/woff2/include', ++ '%%LOCALBASE%%/include/woff2', + ] + + ots_sources = [ +@@ -167,10 +167,10 @@ ots_sources = [ + 'src/vvar.h', + ] + +-ots_libs = [libbrotli, libwoff2] ++#ots_libs = [libbrotli, libwoff2] + + if get_option('graphite') +- ots_includes += ['third_party/lz4/lib'] ++ ots_includes += ['%%LOCALBASE%%/include'] + ots_sources += [ + 'src/feat.cc', + 'src/feat.h', +@@ -186,21 +186,27 @@ if get_option('graphite') + 'src/sill.h', + 'src/sill.cc', + ] +- liblz4 = library('lz4', +- 'third_party/lz4/lib/lz4.c', +- 'third_party/lz4/lib/lz4.h', +- ) +- ots_libs += [liblz4] ++# liblz4 = library('lz4', ++# 'third_party/lz4/lib/lz4.c', ++# 'third_party/lz4/lib/lz4.h', ++# ) ++# ots_libs += [liblz4] + endif + ++libbrotlicommon = dependency('libbrotlicommon') ++libbrotlidec = dependency('libbrotlidec') ++libwoff2common = dependency('libwoff2common') ++libwoff2dec = dependency('libwoff2dec') ++liblz4 = dependency('liblz4') + zlib = dependency('zlib', fallback : ['zlib', 'zlib_dep']) + + libots = library('ots', + ots_sources, + include_directories: include_directories(ots_includes), +- link_with: ots_libs, + cpp_args : '-DHAVE_CONFIG_H', +- dependencies: zlib, ++ dependencies: [libbrotlicommon, libbrotlidec, libwoff2common, libwoff2dec, liblz4, zlib], ++ version : meson.project_version(), ++ install: true, + ) + + +@@ -226,6 +232,7 @@ executable('ots-fuzzer', + cpp_args: fuzzer_defines, + link_with: libots, + link_args: fuzzer_ldflags, ++ install: true, + ) + + +@@ -291,12 +298,13 @@ endif + + + gtest = dependency('gtest', fallback: ['gtest', 'gtest_main_dep']) ++gtest_main = dependency('gtest_main') + + cff_charstring = executable('cff_charstring', + 'tests/cff_charstring_test.cc', + include_directories: include_directories(['include', 'src']), + link_with: libots, +- dependencies: gtest, ++ dependencies: [gtest, gtest_main], + ) + + test('cff_charstring', cff_charstring) +@@ -306,7 +314,7 @@ layout_common_table = executable('layout_common_table' + 'tests/layout_common_table_test.cc', + include_directories: include_directories(['include', 'src']), + link_with: libots, +- dependencies: gtest, ++ dependencies: [gtest, gtest_main], + ) + + test('layout_common_table', layout_common_table) Property changes on: head/x11-fonts/ots/files/patch-meson.build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fonts/ots/pkg-descr =================================================================== --- head/x11-fonts/ots/pkg-descr (nonexistent) +++ head/x11-fonts/ots/pkg-descr (revision 522082) @@ -0,0 +1,11 @@ +The OpenType Sanitizer (OTS) parses and serializes OpenType files (OTF, TTF) and +WOFF and WOFF2 font files, validating them and sanitizing them as it goes. + +The C library is integrated into Chromium and Firefox, and also simple command +line tools to check files offline in a Terminal. + +The CSS font-face property is great for web typography. Having to use images in +order to get the correct typeface is a great sadness; one should be able to use +vectors. + +WWW: https://github.com/khaledhosny/ots Property changes on: head/x11-fonts/ots/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fonts/ots/pkg-plist =================================================================== --- head/x11-fonts/ots/pkg-plist (nonexistent) +++ head/x11-fonts/ots/pkg-plist (revision 522082) @@ -0,0 +1,10 @@ +bin/ots-fuzzer +bin/ots-idempotent +bin/ots-perf +bin/ots-sanitize +bin/ots-side-by-side +bin/ots-validator-checker +lib/libots.a +lib/libots.so +lib/libots.so.8 +lib/libots.so.8.0.0 Property changes on: head/x11-fonts/ots/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property