From ef226f2ae16399d08a91cfbd03036f6e984708ea Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 1 Jun 2019 02:19:23 +0200
Subject: [PATCH] - system-libs.mk: update freetype build

---
 archive-patches/freetype2-config.patch        | 20 +++++++++++++++++++
 archive-patches/freetype2-pkgconf.patch       | 14 +++++++++++++
 ...ubpixel.patch => freetype2-subpixel.patch} |  0
 make/system-libs.mk                           | 17 ++++++++++------
 4 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 archive-patches/freetype2-config.patch
 create mode 100644 archive-patches/freetype2-pkgconf.patch
 rename archive-patches/{freetype2_subpixel.patch => freetype2-subpixel.patch} (100%)

diff --git a/archive-patches/freetype2-config.patch b/archive-patches/freetype2-config.patch
new file mode 100644
index 00000000..dfacfe92
--- /dev/null
+++ b/archive-patches/freetype2-config.patch
@@ -0,0 +1,20 @@
+diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+index 2d5b90d..1c14aab 100644
+--- a/builds/unix/freetype-config.in
++++ b/builds/unix/freetype-config.in
+@@ -35,11 +35,11 @@ if test $? -eq 0 ; then
+   dynamic_libs=`%PKG_CONFIG% --libs freetype2`
+   static_libs=`%PKG_CONFIG% --static --libs freetype2`
+ else
+-  prefix="%prefix%"
+-  exec_prefix="%exec_prefix%"
++prefix="%prefix%"
++  exec_prefix="${prefix}"
+ 
+-  includedir="%includedir%"
+-  libdir="%libdir%"
++  includedir="${prefix}/include"
++  libdir="${exec_prefix}/lib"
+ 
+   version=%ft_version%
+ 
diff --git a/archive-patches/freetype2-pkgconf.patch b/archive-patches/freetype2-pkgconf.patch
new file mode 100644
index 00000000..9d0fb06c
--- /dev/null
+++ b/archive-patches/freetype2-pkgconf.patch
@@ -0,0 +1,14 @@
+--- a/builds/unix/freetype2.in
++++ b/builds/unix/freetype2.in
+@@ -1,7 +1,7 @@
+ prefix=%prefix%
+-exec_prefix=%exec_prefix%
+-libdir=%libdir%
+-includedir=%includedir%
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: FreeType 2
+ URL: https://freetype.org
+
diff --git a/archive-patches/freetype2_subpixel.patch b/archive-patches/freetype2-subpixel.patch
similarity index 100%
rename from archive-patches/freetype2_subpixel.patch
rename to archive-patches/freetype2-subpixel.patch
diff --git a/make/system-libs.mk b/make/system-libs.mk
index cd173b22..328c7afe 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -232,7 +232,9 @@ FREETYPE_VER = 2.9.1
 $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2:
 	$(WGET) https://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VER)/freetype-$(FREETYPE_VER).tar.bz2
 
-FREETYPE_PATCH  = freetype2_subpixel.patch
+FREETYPE_PATCH  = freetype2-subpixel.patch
+FREETYPE_PATCH += freetype2-config.patch
+FREETYPE_PATCH += freetype2-pkgconf.patch
 
 $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/freetype-$(FREETYPE_VER)
@@ -246,8 +248,8 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 		autoconf
 	$(CHDIR)/freetype-$(FREETYPE_VER); \
 		$(CONFIGURE) \
-			--prefix=$(TARGET_DIR) \
-			--mandir=$(BUILD_TMP)/.remove \
+			--prefix= \
+			--mandir=/.remove \
 			--enable-shared \
 			--disable-static \
 			--enable-freetype-config \
@@ -257,9 +259,12 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2
 			--without-bzip2 \
 			; \
 		$(MAKE) all; \
-		make install; \
-		ln -sf ./freetype2/freetype $(TARGET_INCLUDE_DIR)/freetype; \
-	mv $(TARGET_DIR)/bin/freetype-config $(HOST_DIR)/bin/freetype-config
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
+	ln -sf freetype2 $(TARGET_INCLUDE_DIR)/freetype
+	mv $(TARGET_DIR)/bin/freetype-config $(HOST_DIR)/bin
+	$(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config
+	$(REWRITE_PKGCONF)/freetype2.pc
+	$(REWRITE_LIBTOOL)/libfreetype.la
 	$(REMOVE)/freetype-$(FREETYPE_VER) $(TARGET_DIR)/share/aclocal
 	$(TOUCH)