From ea1e098d9796ad94cbdce127c0d046ee40ef2157 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 4 Aug 2019 23:53:11 +0300
Subject: [PATCH] freetype/harfbuzz: merge into single package

---
 extra/imlib2/depends       |  2 +-
 testing/firefox/depends    |  2 +-
 testing/harfbuzz/build     |  8 --------
 testing/harfbuzz/checksums |  1 -
 testing/harfbuzz/depends   |  2 --
 testing/harfbuzz/sources   |  1 -
 testing/harfbuzz/version   |  1 -
 testing/libass/depends     |  2 +-
 testing/pango/depends      |  2 +-
 xorg/fontconfig/depends    |  2 +-
 xorg/freetype/build        | 10 ----------
 xorg/freetype/checksums    |  1 -
 xorg/freetype/sources      |  1 -
 xorg/freetype/version      |  1 -
 xorg/libXfont2/depends     |  8 ++++----
 xorg/libXft/depends        |  8 ++++----
 16 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100755 testing/harfbuzz/build
 delete mode 100644 testing/harfbuzz/checksums
 delete mode 100644 testing/harfbuzz/depends
 delete mode 100644 testing/harfbuzz/sources
 delete mode 100644 testing/harfbuzz/version
 delete mode 100755 xorg/freetype/build
 delete mode 100644 xorg/freetype/checksums
 delete mode 100644 xorg/freetype/sources
 delete mode 100644 xorg/freetype/version

diff --git a/extra/imlib2/depends b/extra/imlib2/depends
index b42915db..97e0df82 100644
--- a/extra/imlib2/depends
+++ b/extra/imlib2/depends
@@ -1,4 +1,4 @@
-freetype
+freetype-harfbuzz
 libXext
 
 # By default, gif and tiff are commented. You can enable support for
diff --git a/testing/firefox/depends b/testing/firefox/depends
index 17872e1c..d870d083 100644
--- a/testing/firefox/depends
+++ b/testing/firefox/depends
@@ -3,7 +3,7 @@ cargo         make
 cbindgen      make
 clang         make
 ffmpeg
-freetype      make
+freetype-harfbuzz make
 gtk+2         make
 gtk+3
 libSM         make
diff --git a/testing/harfbuzz/build b/testing/harfbuzz/build
deleted file mode 100755
index e1d3b53f..00000000
--- a/testing/harfbuzz/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --with-glib
-
-make
-make DESTDIR="$1" install
diff --git a/testing/harfbuzz/checksums b/testing/harfbuzz/checksums
deleted file mode 100644
index c704dd0f..00000000
--- a/testing/harfbuzz/checksums
+++ /dev/null
@@ -1 +0,0 @@
-fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c  harfbuzz-2.5.3.tar.xz
diff --git a/testing/harfbuzz/depends b/testing/harfbuzz/depends
deleted file mode 100644
index 7f9121cc..00000000
--- a/testing/harfbuzz/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-glib
-freetype
diff --git a/testing/harfbuzz/sources b/testing/harfbuzz/sources
deleted file mode 100644
index 750ff6ae..00000000
--- a/testing/harfbuzz/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.5.3.tar.xz
diff --git a/testing/harfbuzz/version b/testing/harfbuzz/version
deleted file mode 100644
index 6a63654a..00000000
--- a/testing/harfbuzz/version
+++ /dev/null
@@ -1 +0,0 @@
-2.5.3 1
diff --git a/testing/libass/depends b/testing/libass/depends
index 97c72525..d074f756 100644
--- a/testing/libass/depends
+++ b/testing/libass/depends
@@ -3,4 +3,4 @@ yasm make
 expat
 fribidi
 fontconfig
-freetype
+freetype-harfbuzz
diff --git a/testing/pango/depends b/testing/pango/depends
index a66c2bc0..e124feda 100644
--- a/testing/pango/depends
+++ b/testing/pango/depends
@@ -1,5 +1,5 @@
 glib
-harfbuzz
+freetype-harfbuzz
 fontconfig
 fribidi
 cairo
diff --git a/xorg/fontconfig/depends b/xorg/fontconfig/depends
index 29a39a8a..3d20895d 100644
--- a/xorg/fontconfig/depends
+++ b/xorg/fontconfig/depends
@@ -1,3 +1,3 @@
 expat
-freetype
+freetype-harfbuzz
 gperf    make
diff --git a/xorg/freetype/build b/xorg/freetype/build
deleted file mode 100755
index 1b29c81f..00000000
--- a/xorg/freetype/build
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-CFLAGS="$CFLAGS -DDEFAULT_TT_INTERPRETER_VERSION=TT_INTERPRETER_VERSION_40" \
-./configure \
-    --prefix=/usr \
-    --enable-freetype-config \
-    --with-harfbuzz=no
-
-make
-make DESTDIR="$1" install
diff --git a/xorg/freetype/checksums b/xorg/freetype/checksums
deleted file mode 100644
index e307caf8..00000000
--- a/xorg/freetype/checksums
+++ /dev/null
@@ -1 +0,0 @@
-db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d  freetype-2.9.1.tar.bz2
diff --git a/xorg/freetype/sources b/xorg/freetype/sources
deleted file mode 100644
index 7cebe3ea..00000000
--- a/xorg/freetype/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2
diff --git a/xorg/freetype/version b/xorg/freetype/version
deleted file mode 100644
index 58801c91..00000000
--- a/xorg/freetype/version
+++ /dev/null
@@ -1 +0,0 @@
-2.9.1 2
diff --git a/xorg/libXfont2/depends b/xorg/libXfont2/depends
index b3068a53..115f6b8b 100644
--- a/xorg/libXfont2/depends
+++ b/xorg/libXfont2/depends
@@ -1,4 +1,4 @@
-freetype   make
-libfontenc make
-xorgproto  make
-xtrans     make
+freetype-harfbuzz make
+libfontenc        make
+xorgproto         make
+xtrans            make
diff --git a/xorg/libXft/depends b/xorg/libXft/depends
index 81a396a4..57d955e8 100644
--- a/xorg/libXft/depends
+++ b/xorg/libXft/depends
@@ -1,4 +1,4 @@
-fontconfig make
-freetype   make
-libXrender make
-xorgproto  make
+fontconfig        make
+freetype-harfbuzz make
+libXrender        make
+xorgproto         make